JERSEY-3088: Traverse maps during field processing.

Change-Id: Ie627b3582b591bdf9dde827d40b2f308c2feb54c

Author: glucas

incubator/declarative-linking/src/main/java/org/glassfish/jersey/linking/FieldProcessor.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -47,6 +47,7 @@
 import java.util.logging.Logger;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import javax.ws.rs.core.Link;
 import javax.ws.rs.core.UriInfo;
@@ -133,7 +134,7 @@ private void processLinks(Object entity, Object resource, Object instance,
             }
         }
 
-        // If entity is an array or collection then process members
+        // If entity is an array, collection, or map then process members
         Class<?> instanceClass = instance.getClass();
         if (instanceClass.isArray() && Object[].class.isAssignableFrom(instanceClass)) {
             Object array[] = (Object[]) instance;
@@ -145,6 +146,11 @@ private void processLinks(Object entity, Object resource, Object instance,
             for (Object member : iterable) {
                 processMember(entity, resource, member, processed, uriInfo, rmc);
             }
+        } else if (instance instanceof Map) {
+            Map map = (Map) instance;
+            for (Object member : map.entrySet()) {
+                processMember(entity, resource, member, processed, uriInfo, rmc);
+            }
         }
 
         // Recursively process all member fields

incubator/declarative-linking/src/test/java/org/glassfish/jersey/linking/FieldProcessorTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -43,8 +43,10 @@
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Filter;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
@@ -346,6 +348,21 @@ public void testCollection() {
         assertEquals("widgets/20", list.get(1).link);
     }
 
+    @Test
+    public void testMap() {
+        LOG.info("Map");
+        FieldProcessor<Map> instance = new FieldProcessor(Map.class);
+        TestClassE item1 = new TestClassE("10");
+        TestClassE item2 = new TestClassE("20");
+        Map<String, TestClassE> map = new HashMap<>();
+        for (TestClassE item : Arrays.asList(item1, item2)) {
+            map.put(item.getId(), item);
+        }
+        instance.processLinks(map, mockUriInfo, mockRmc);
+        assertEquals("widgets/10", map.get("10").link);
+        assertEquals("widgets/20", map.get("20").link);
+    }
+
     public static class TestClassG {
 
         @InjectLink(value = TEMPLATE_B, style = InjectLink.Style.RELATIVE_PATH)