You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by da...@apache.org on 2016/08/22 09:10:43 UTC
svn commit: r1757121 - in /felix/trunk/converter/src:
main/java/org/apache/felix/converter/impl/
test/java/org/apache/felix/converter/impl/
Author: davidb
Date: Mon Aug 22 09:10:43 2016
New Revision: 1757121
URL: http://svn.apache.org/viewvc?rev=1757121&view=rev
Log:
FELIX-5330 Double fields in Map if superclass shares a field name
Fixes the issue
Added:
felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/MySubDTO.java
Modified:
felix/trunk/converter/src/main/java/org/apache/felix/converter/impl/ConvertingImpl.java
felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/ConverterServiceTest.java
felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/MyDTO.java
Modified: felix/trunk/converter/src/main/java/org/apache/felix/converter/impl/ConvertingImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/src/main/java/org/apache/felix/converter/impl/ConvertingImpl.java?rev=1757121&r1=1757120&r2=1757121&view=diff
==============================================================================
--- felix/trunk/converter/src/main/java/org/apache/felix/converter/impl/ConvertingImpl.java (original)
+++ felix/trunk/converter/src/main/java/org/apache/felix/converter/impl/ConvertingImpl.java Mon Aug 22 09:10:43 2016
@@ -476,22 +476,16 @@ public class ConvertingImpl implements C
return result;
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings("rawtypes")
private static Map createMapFromDTO(Object obj, Converter converter) {
- Map result = new HashMap();
+ Set<String> handledFields = new HashSet<>();
+ Map result = new HashMap();
+ for (Field f : obj.getClass().getDeclaredFields()) {
+ handleField(obj, f, handledFields, result, converter);
+ }
for (Field f : obj.getClass().getFields()) {
- if (Modifier.isStatic(f.getModifiers()))
- continue;
-
- try {
- Object fVal = f.get(obj);
- if(fVal instanceof DTO)
- fVal = converter.convert(fVal).to(Map.class);
- // TODO test for other embedded types that need conversion
- result.put(f.getName(), fVal);
- } catch (Exception e) {
- }
+ handleField(obj, f, handledFields, result, converter);
}
return result;
}
@@ -573,6 +567,26 @@ public class ConvertingImpl implements C
}
@SuppressWarnings({ "rawtypes", "unchecked" })
+ private static void handleField(Object obj, Field field, Set<String> handledFields, Map result, Converter converter) {
+ if (Modifier.isStatic(field.getModifiers()))
+ return;
+
+ String fn = field.getName();
+ if (handledFields.contains(fn))
+ return; // Field with this name was already handled
+
+ try {
+ Object fVal = field.get(obj);
+ if(fVal instanceof DTO)
+ fVal = converter.convert(fVal).to(Map.class);
+ // TODO test for other embedded types that need conversion
+ result.put(field.getName(), fVal);
+ handledFields.add(fn);
+ } catch (Exception e) {
+ }
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
private static void handleBeanMethod(Object obj, Method md, Set<String> invokedMethods, Map res) {
if (Modifier.isStatic(md.getModifiers()))
return;
Modified: felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/ConverterServiceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/ConverterServiceTest.java?rev=1757121&r1=1757120&r2=1757121&view=diff
==============================================================================
--- felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/ConverterServiceTest.java (original)
+++ felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/ConverterServiceTest.java Mon Aug 22 09:10:43 2016
@@ -395,7 +395,7 @@ public class ConverterServiceTest {
embedded.marco = "hohoho";
embedded.polo = Long.MAX_VALUE;
embedded.alpha = Alpha.A;
-
+
MyDTO dto = new MyDTO();
dto.ping = "lalala";
dto.pong = Long.MIN_VALUE;
@@ -416,6 +416,28 @@ public class ConverterServiceTest {
assertEquals(Alpha.A, e.get("alpha"));
}
+ @Test @SuppressWarnings({ "rawtypes", "unchecked" })
+ public void testDTOFieldShadowing() {
+ MySubDTO dto = new MySubDTO();
+ dto.ping = "test";
+ dto.count = Count.THREE;
+
+ Map m = converter.convert(dto).to(new TypeReference<Map<String,String>>() {});
+
+ Map<String, String> expected = new HashMap<>();
+ expected.put("ping", "test");
+ expected.put("count", "THREE");
+ expected.put("pong", "0");
+ expected.put("embedded", null);
+ assertEquals(expected, new HashMap<String, String>(m));
+
+ MySubDTO dto2 = converter.convert(m).to(MySubDTO.class);
+ assertEquals("test", dto2.ping);
+ assertEquals(Count.THREE, dto2.count);
+ assertEquals(0L, dto2.pong);
+ assertNull(dto2.embedded);
+ }
+
@Test
public void testMap2DTO() {
Map<String, Object> m = new HashMap<>();
Modified: felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/MyDTO.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/MyDTO.java?rev=1757121&r1=1757120&r2=1757121&view=diff
==============================================================================
--- felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/MyDTO.java (original)
+++ felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/MyDTO.java Mon Aug 22 09:10:43 2016
@@ -29,3 +29,4 @@ public class MyDTO extends DTO {
public MyEmbeddedDTO embedded;
}
+
Added: felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/MySubDTO.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/MySubDTO.java?rev=1757121&view=auto
==============================================================================
--- felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/MySubDTO.java (added)
+++ felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/MySubDTO.java Mon Aug 22 09:10:43 2016
@@ -0,0 +1,21 @@
+/*
+ * 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.felix.converter.impl;
+
+public class MySubDTO extends MyDTO {
+ public String ping;
+}