[johnzon] branch master updated: [JOHNZON-316] ensure parameterized type use their own instance as key cache in mappins and not just the raw type

[rmannibucau]

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git


The following commit(s) were added to refs/heads/master by this push:
     new c1860cf  [JOHNZON-316] ensure parameterized type use their own 
instance as key cache in mappins and not just the raw type
c1860cf is described below

commit c1860cfedaabd07c73471f2023360ee52e1e5b01
Author: Romain Manni-Bucau <rmannibu...@gmail.com>
AuthorDate: Fri Jul 3 16:40:45 2020 +0200

    [JOHNZON-316] ensure parameterized type use their own instance as key cache 
in mappins and not just the raw type
---
 .../java/org/apache/johnzon/mapper/Mappings.java   | 11 +++--
 .../MapingsKeyCacheForParameterizedTypesTest.java  | 50 ++++++++++++++++++++++
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git 
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java 
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java
index 0d8adbb..1c5db42 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java
@@ -387,15 +387,16 @@ public class Mappings {
     }
 
     public ClassMapping findOrCreateClassMapping(final Type clazz) {
-        return doFindOrCreateClassMapping(clazz, emptyMap());
+        return doFindOrCreateClassMapping(clazz, emptyMap(), false);
     }
 
-    private ClassMapping doFindOrCreateClassMapping(final Type clazz, final 
Map<Type, Type> args) {
+    private ClassMapping doFindOrCreateClassMapping(final Type clazz, final 
Map<Type, Type> args,
+                                                    final boolean 
noPutForClass) {
         ClassMapping classMapping = classes.get(clazz);
         if (classMapping == null) {
             if (ParameterizedType.class.isInstance(clazz)) {
                 final ParameterizedType pt = 
ParameterizedType.class.cast(clazz);
-                final ClassMapping mapping = 
doFindOrCreateClassMapping(pt.getRawType(), Generics.toResolvedTypes(pt));
+                final ClassMapping mapping = 
doFindOrCreateClassMapping(pt.getRawType(), Generics.toResolvedTypes(pt), true);
                 return putOrGetClassMapping(clazz, mapping);
             }
             if (!Class.class.isInstance(clazz)) {
@@ -414,7 +415,9 @@ public class Mappings {
             } else {
                 classMapping = createClassMapping(asClass, args);
             }
-            classMapping = putOrGetClassMapping(clazz, classMapping);
+            if (!noPutForClass) {
+                classMapping = putOrGetClassMapping(clazz, classMapping);
+            }
         }
         return classMapping;
     }
diff --git 
a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapingsKeyCacheForParameterizedTypesTest.java
 
b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapingsKeyCacheForParameterizedTypesTest.java
new file mode 100644
index 0000000..bc08f84
--- /dev/null
+++ 
b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapingsKeyCacheForParameterizedTypesTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.johnzon.mapper;
+
+import org.apache.johnzon.mapper.reflection.JohnzonParameterizedType;
+import org.junit.Test;
+
+import java.util.Collection;
+
+import static junit.framework.TestCase.assertEquals;
+
+public class MapingsKeyCacheForParameterizedTypesTest {
+    // before the fix: java.lang.ClassCastException:
+    // MapingsKeyCacheForParameterizedTypesTest$Salmon cannot be cast to 
MapingsKeyCacheForParameterizedTypesTest$Fish
+    @Test
+    public void ensureParameterizedTypeDontEndUpOnClass() {
+        try (final Mapper mapper = new MapperBuilder().build()) {
+            final Foo<Salmon> salmons = mapper.readObject("{\"bars\":[{}]}", 
new JohnzonParameterizedType(Foo.class, Salmon.class));
+            assertEquals(Salmon.class, 
salmons.bars.iterator().next().getClass());
+            final Foo<Fish> fishes = mapper.readObject("{\"bars\":[{}]}", new 
JohnzonParameterizedType(Foo.class, Fish.class));
+            assertEquals(Fish.class, fishes.bars.iterator().next().getClass());
+        }
+    }
+
+    public static class Foo<Bar> {
+        public Collection<Bar> bars;
+    }
+
+    public static class Salmon /*NO INHERITANCE*/ {
+    }
+
+    public static class Fish /*NO INHERITANCE*/ {
+    }
+}