From dd253548cd3f54937c1594e0a453a450de5c11fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20L=C3=B6bel?= Date: Thu, 26 Dec 2019 12:06:19 +0100 Subject: [PATCH] Removed basePath handling in CacheableProvider. --- pom.xml | 2 +- .../provider/CacheableJsonSchemaProvider.java | 20 +++++-------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index ff83398..1493470 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.JanLoebel json-schema-validation-starter - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT UTF-8 diff --git a/src/main/java/com/github/JanLoebel/jsonschemavalidation/provider/CacheableJsonSchemaProvider.java b/src/main/java/com/github/JanLoebel/jsonschemavalidation/provider/CacheableJsonSchemaProvider.java index bc5f04d..844630f 100644 --- a/src/main/java/com/github/JanLoebel/jsonschemavalidation/provider/CacheableJsonSchemaProvider.java +++ b/src/main/java/com/github/JanLoebel/jsonschemavalidation/provider/CacheableJsonSchemaProvider.java @@ -8,28 +8,18 @@ public class CacheableJsonSchemaProvider extends DefaultJsonSchemaProvider { private final Map cache = new ConcurrentHashMap<>(); - private final String basePath; - - public CacheableJsonSchemaProvider(String basePath) { - this.basePath = basePath; - } - - public CacheableJsonSchemaProvider() { - this(""); - } @Override public JsonSchema loadSchema(String url) { - final String fullPath = basePath + url; - if (cache.containsKey(fullPath)) { - return cache.get(fullPath); + if (cache.containsKey(url)) { + return cache.get(url); } - return putToCache(fullPath, super.loadSchema(fullPath)); + return putToCache(url, super.loadSchema(url)); } - private JsonSchema putToCache(String fullPath, JsonSchema jsonSchema) { - cache.put(fullPath, jsonSchema); + private JsonSchema putToCache(String url, JsonSchema jsonSchema) { + cache.put(url, jsonSchema); return jsonSchema; }