v1.5.2: strategy clear cache

Author: cordisvictor

README.md

@@ -60,9 +60,13 @@ for a higher control compared to the EasyML Facade.
 
 ### Release Notes
 
+!Release 1.5.2
+- feature: added generic mechanism for cache clearing.
+
+
 !Release 1.5.1
-- feature: add functional API.
-- feature: add CalendarStrategy and OptionalStrategy.
+- feature: added functional API.
+- feature: added CalendarStrategy and OptionalStrategy.
 - feature: added java.time strategies.
 - performance: added caching to SerializableStrategy.
 - refactor: remove Profile feature.

easyml/src/net/sourceforge/easyml/XMLReader.java

@@ -18,10 +18,7 @@
  */
 package net.sourceforge.easyml;
 
-import net.sourceforge.easyml.marshalling.CompositeReader;
-import net.sourceforge.easyml.marshalling.CompositeStrategy;
-import net.sourceforge.easyml.marshalling.SimpleStrategy;
-import net.sourceforge.easyml.marshalling.UnmarshalContext;
+import net.sourceforge.easyml.marshalling.*;
 import net.sourceforge.easyml.marshalling.dtd.*;
 import net.sourceforge.easyml.marshalling.java.io.SerializableStrategy;
 import net.sourceforge.easyml.marshalling.java.lang.*;
@@ -1090,6 +1087,7 @@ public void reset(Document in) {
      */
     public void clearCache() {
         this.checkNotSharedConfiguration();
+        // clear class and field cache:
         final Iterator<Map.Entry<String, Object>> iter = this.cachedAliasingReflection.entrySet().iterator();
         while (iter.hasNext()) {
             final Map.Entry<String, Object> crt = iter.next();
@@ -1106,11 +1104,9 @@ public void clearCache() {
                 iter.remove(); // removed non-alias entry.
             }
         }
-        // clear SerializableStrategy cache if present:
-        final CompositeStrategy serialStrategy = this.compositeStrategies.get(SerializableStrategy.NAME);
-        if (serialStrategy instanceof SerializableStrategy) {
-            ((SerializableStrategy) serialStrategy).clearCache();
-        }
+        // clear strategies cache:
+        this.simpleStrategies.values().forEach(XMLReader::clearCache);
+        this.compositeStrategies.values().forEach(XMLReader::clearCache);
     }
 
     private static String fieldNameFrom(String fieldFQN) {
@@ -1121,6 +1117,12 @@ private static boolean isCacheEntry(String key, String name) {
         return key.equals(name);
     }
 
+    private static void clearCache(Strategy s) {
+        if (s instanceof Caching) {
+            ((Caching) s).clearCache();
+        }
+    }
+
     /**
      * Closes this instance by releasing all resources.
      */

easyml/src/net/sourceforge/easyml/XMLWriter.java

@@ -201,6 +201,17 @@ public boolean remove(S s) {
             }
         }
 
+        /**
+         * Applies the consumer on all registered strategies.
+         */
+        public void forEach(Consumer<S> consumer) {
+            this.strict.forEach((k, v) -> consumer.accept(v));
+            this.range.forEach(consumer);
+            if (this.backup != null) {
+                this.backup.forEach(consumer);
+            }
+        }
+
         /**
          * Clears this instance of all strategies.
          */
@@ -1022,10 +1033,15 @@ public void reset(Document out) {
      */
     public void clearCache() {
         this.checkNotSharedConfiguration();
-        // clear SerializableStrategy cache if present:
-        final CompositeStrategy serialStrategy = this.compositeStrategies.lookup(SerializableStrategy.TARGET);
-        if (serialStrategy instanceof SerializableStrategy) {
-            ((SerializableStrategy) serialStrategy).clearCache();
+        // no class and field cache.
+        // clear strategies cache:
+        this.simpleStrategies.forEach(XMLWriter::clearCache);
+        this.compositeStrategies.forEach(XMLWriter::clearCache);
+    }
+
+    private static void clearCache(Strategy s) {
+        if (s instanceof Caching) {
+            ((Caching) s).clearCache();
         }
     }
 

easyml/src/net/sourceforge/easyml/marshalling/Caching.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2012 Victor Cordis
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Please contact the author ( [email protected] ) if you need additional
+ * information or have any questions.
+ */
+package net.sourceforge.easyml.marshalling;
+
+/**
+ * Caching interface defines objects which do caching.
+ *
+ * @author Victor Cordis ( cordis.victor at gmail.com)
+ * @version 1.5.2
+ * @since 1.5.2
+ */
+public interface Caching {
+
+    /**
+     * Clears the cache of this instance.
+     */
+    void clearCache();
+}

easyml/src/net/sourceforge/easyml/marshalling/java/io/SerializableStrategy.java

@@ -54,7 +54,7 @@
  * @version 1.5.1
  * @since 1.0
  */
-public final class SerializableStrategy extends AbstractStrategy implements CompositeStrategy<Serializable> {
+public final class SerializableStrategy extends AbstractStrategy implements CompositeStrategy<Serializable>, Caching {
     /**
      * Constant defining the value used for the strategy name.
      */
@@ -97,6 +97,10 @@ public SerializableStrategy() {
         readObjectCache = new ConcurrentHashMap<>();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public void clearCache() {
         writeReplaceCache.clear();
         writeObjectCache.clear();