caching local profiles

Author: wowasa

curation-cr/src/main/java/eu/clarin/cmdi/curation/cr/cache/CRCache.java

@@ -51,7 +51,7 @@ public class CRCache {
     * @return the public entry
     * @throws CCRServiceNotAvailableException the ccr service is not available
     */
-   @Cacheable(value = "crCache", key ="#schemaLocation", condition = "#schemaLocation.startsWith('http')", sync = true)
+   @Cacheable(value = "crCache", key ="#schemaLocation", sync = true)
    public ProfileCacheEntry getEntry(String schemaLocation) throws CRServiceStorageException, CCRServiceNotAvailableException, PPHCacheException {
 
       String fileName = schemaLocation.replaceAll("[/.:]", "_");

curation-cr/src/test/java/eu/clarin/cmdi/curation/cr/CRServiceTests.java

@@ -86,8 +86,6 @@ void serverNotAvailable() {
             assertNotNull(cacheManager.getCache("crCache").get("http://www.wowasa.com/clarin.eu:cr1:p_1403526079381/xsd"));
             // even with a local file it should throw an exception
             assertDoesNotThrow(() -> this.crCache.getEntry(Paths.get("tmp", "77777").toUri().toString()));
-            // but it shouldn't be cached
-            assertNull(cacheManager.getCache("crCache").get(Paths.get("tmp", "77777").toUri().toString()));
         }
         catch (Exception e) {
 
@@ -176,10 +174,7 @@ void cacheUsage() {
 
             assertNotNull(cacheManager.getCache("crCache").get("https://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/1.x/profiles/clarin.eu:cr1:p_1403526079380/xsd"));
             assertNotNull(cacheManager.getCache("crCache").get("https://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/1.x/profiles/clarin.eu:cr1:p_9990106710826/xsd"));
-            // next should NOT be cached when loaded from a file
-            assertNull(cacheManager.getCache("crCache").get(this.crConfig.getCrCache().resolve("https___catalog_clarin_eu_ds_ComponentRegistry_rest_registry_1_x_profiles_clarin_eu_cr1_p_1403526079380_xsd.xsd").toUri().toString()));
-
-        }
+         }
         catch (Exception e) {
 
             log.error("error in schema");