svn commit: r1858979 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/base/src/test/java/org/apache/ofbiz/base/util/collections/MapContextTest.java

Author: jleroux
Date: Thu May  9 09:01:19 2019
New Revision: 1858979

URL: http://svn.apache.org/viewvc?rev=1858979&view=rev
Log:
"Applied fix from trunk for revision: 1858483"
------------------------------------------------------------------------
r1858483 | mthl | 2019-05-01 14:55:51 +0200 (mer. 01 mai 2019) | 7 lignes

Improved: Remove unneeded generics in ‘MapContextTest’
(OFBIZ-10933)

This is done to remove a warning in OpenJDK 8 which doesn't seem to
handle ‘@safevarargs’ annotation properly when using generics.  This
warning was not present with OpenJDK 11.

------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/test/java/org/apache/ofbiz/base/util/collections/MapContextTest.java

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  9 09:01:19 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858523,1858539,1858965
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965

Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/test/java/org/apache/ofbiz/base/util/collections/MapContextTest.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/test/java/org/apache/ofbiz/base/util/collections/MapContextTest.java?rev=1858979&r1=1858978&r2=1858979&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/test/java/org/apache/ofbiz/base/util/collections/MapContextTest.java (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/test/java/org/apache/ofbiz/base/util/collections/MapContextTest.java Thu May  9 09:01:19 2019
@@ -41,11 +41,11 @@ public class MapContextTest {
      *
      * @see ControllerConfig
      */
-    static class PNode<K, V> {
+    static class PNode {
         /** The properties of the node. */
-        public Map<K, V> props;
+        public Map<String, String> props;
         /** The included identifier of nodes. */
-        private List<PNode<K, V>> includes;
+        private List<PNode> includes;
 
         /**
          * Constructs a node without properties.
@@ -53,7 +53,7 @@ public class MapContextTest {
          * @param includes  the included nodes
          */
         @SafeVarargs
-        public PNode(PNode<K, V>... includes) {
+        public PNode(PNode... includes) {
             this(Collections.emptyMap(), includes);
         }
 
@@ -64,7 +64,7 @@ public class MapContextTest {
          * @param includes  the included nodes
          */
         @SafeVarargs
-        public PNode(Map<K, V> props, PNode<K, V>... includes) {
+        public PNode(Map<String, String> props, PNode... includes) {
             this.props = props;
             this.includes = Arrays.asList(includes);
         }
@@ -74,8 +74,8 @@ public class MapContextTest {
          *
          * @return a map context containing the properties of the tree.
          */
-        public MapContext<K, V> allProps() {
-            MapContext<K, V> res = new MapContext<>();
+        public MapContext<String, String> allProps() {
+            MapContext<String, String> res = new MapContext<>();
             includes.forEach(inc -> res.push(inc.allProps()));
             res.push(props);
             return res;
@@ -90,10 +90,10 @@ public class MapContextTest {
                 UtilMisc.toMap(LinkedHashMap::new, "aa", "1", "ab", "1");
         Map<String, String> propsB =
                 UtilMisc.toMap(LinkedHashMap::new, "ba", "3", "bb", "8", "bc", "1", "bd", "14");
-        PNode<String, String> pn = new PNode<>(propsA,
-                new PNode<>(propsB, new PNode<>(), new PNode<>()),
-                new PNode<>(new PNode<>()),
-                new PNode<>());
+        PNode pn = new PNode(propsA,
+                new PNode(propsB, new PNode(), new PNode()),
+                new PNode(new PNode()),
+                new PNode());
 
         MapContext<String, String> mc = pn.allProps();
         assertThat("insertion order of LinkedHashMap is preserved by the 'values' method",