Do not hold cache values in soft references

This increases memory overhead of the cache for not good reason, fix
that.

Change-Id: Ib55a7eb2e0a2066a70fe9a7eefa90771e028e8da
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
index be9b3d7a49235b7b1ddedb74369b31b807323153..383618c61217b2d975f8e65400d074f582a98f00 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
+++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
@@ -35,7 +35,7 @@ public final class Types {
                 }
     };
     private static final LoadingCache<Class<?>, ConcreteType> TYPE_CACHE =
-            CacheBuilder.newBuilder().weakKeys().softValues().build(TYPE_LOADER);
+            CacheBuilder.newBuilder().weakKeys().build(TYPE_LOADER);
 
     private static final Type SET_TYPE = typeForClass(Set.class);
     private static final Type LIST_TYPE = typeForClass(List.class);

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/AugmentationFieldGetter.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/AugmentationFieldGetter.java
index 03c04c4c7a231436f2a28fbb6c7d6b5fa2c35ed1..cfec5c36668a8f0afa5e600007317384f33dced2 100644 (file)
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/AugmentationFieldGetter.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/AugmentationFieldGetter.java
@@ -54,7 +54,7 @@ abstract class AugmentationFieldGetter {
     protected abstract Map<Class<? extends Augmentation<?>>, Augmentation<?>> getAugmentations(final Object input);
 
     private static final LoadingCache<Class<?>, AugmentationFieldGetter> AUGMENTATION_GETTERS = CacheBuilder
-            .newBuilder().weakKeys().softValues().build(new AugmentationGetterLoader());
+            .newBuilder().weakKeys().build(new AugmentationGetterLoader());
 
     public static AugmentationFieldGetter getGetter(final Class<? extends Object> clz) {
         if(AugmentationHolder.class.isAssignableFrom(clz)) {