From f85f0889b3b0e5e9694afab4dd01a4a97a155188 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Tue, 3 Jul 2018 07:51:17 -0500 Subject: Collection syntax change because of Sonar Issue-ID: AAF-386 Change-Id: I8ba8d8561d03e680ddc90a81b8db0339814c65fa Signed-off-by: Instrumental --- .../main/java/org/onap/aaf/misc/env/StoreImpl.java | 20 ++++++++++---------- .../java/org/onap/aaf/misc/env/impl/AbsTrans.java | 2 +- .../java/org/onap/aaf/misc/env/impl/BasicEnv.java | 2 +- .../java/org/onap/aaf/misc/env/jaxb/JAXBmar.java | 2 +- .../java/org/onap/aaf/misc/env/jaxb/JAXBumar.java | 2 +- .../main/java/org/onap/aaf/misc/env/util/Pool.java | 2 +- .../aaf/misc/env/util/RefreshableThreadObject.java | 2 +- .../main/java/org/onap/aaf/misc/rosetta/InXML.java | 6 +++--- .../main/java/org/onap/aaf/misc/rosetta/JaxInfo.java | 4 ++-- .../main/java/org/onap/aaf/misc/rosetta/JaxSet.java | 6 +++--- .../main/java/org/onap/aaf/misc/rosetta/OutXML.java | 4 ++-- .../java/org/onap/aaf/misc/rosetta/XmlEscape.java | 4 ++-- .../main/java/org/onap/aaf/misc/xgen/CacheGen.java | 2 +- .../org/onap/aaf/misc/xgen/html/JU_HTML4GenTest.java | 20 ++++++++++---------- .../org/onap/aaf/misc/xgen/html/JU_HTML5GenTest.java | 12 ++++++------ .../org/onap/aaf/misc/xgen/xml/JU_XMLGenTest.java | 2 +- 16 files changed, 46 insertions(+), 46 deletions(-) (limited to 'misc') diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/StoreImpl.java b/misc/env/src/main/java/org/onap/aaf/misc/env/StoreImpl.java index 54b0ce83..685bfb6e 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/StoreImpl.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/StoreImpl.java @@ -65,21 +65,21 @@ public class StoreImpl implements Store { public StoreImpl() { staticState = new Object[growSize]; - staticMap = new HashMap(); - localMap = new HashMap(); + staticMap = new HashMap<>(); + localMap = new HashMap<>(); } public StoreImpl(String tag) { staticState = new Object[growSize]; - staticMap = new HashMap(); - localMap = new HashMap(); + staticMap = new HashMap<>(); + localMap = new HashMap<>(); } public StoreImpl(String tag, String[] args) { staticState = new Object[growSize]; - staticMap = new HashMap(); - localMap = new HashMap(); + staticMap = new HashMap<>(); + localMap = new HashMap<>(); if(tag!=null) { String tequals = tag + '='; @@ -102,8 +102,8 @@ public class StoreImpl implements Store { public StoreImpl(String tag, Properties props) { staticState = new Object[growSize]; - staticMap = new HashMap(); - localMap = new HashMap(); + staticMap = new HashMap<>(); + localMap = new HashMap<>(); if(tag!=null) { String fname = props.getProperty(tag); @@ -191,7 +191,7 @@ public class StoreImpl implements Store { * @see com.att.env.Store#existingSlotNames() */ public List existingSlotNames() { - return new ArrayList(localMap.keySet()); + return new ArrayList<>(localMap.keySet()); } /* (non-Javadoc) @@ -234,7 +234,7 @@ public class StoreImpl implements Store { } public List existingStaticSlotNames() { - return new ArrayList(staticMap.keySet()); + return new ArrayList<>(staticMap.keySet()); } } diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java index f10de386..e378e2c3 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java @@ -37,7 +37,7 @@ public abstract class AbsTrans implements TransStore { private static final Object[] EMPTYO = new Object[0]; protected ENV delegate; - protected List trail = new ArrayList(30); + protected List trail = new ArrayList<>(30); private Object[] state; diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java index 2a3628d3..cd62a7e5 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java @@ -84,7 +84,7 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate(); +// props = new HashMap<>(); // String value; // for(int i=0;i[],Pool> pools = new HashMap[], Pool>(); + private static Map[],Pool> pools = new HashMap<>(); // Handle Marshaller class setting of properties only when needed private class PMarshaller { diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBumar.java b/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBumar.java index 74072aaf..0c078a98 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBumar.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBumar.java @@ -68,7 +68,7 @@ import org.w3c.dom.Node; */ public class JAXBumar { // Need to store off possible JAXBContexts based on Class, which will be stored in Creator - private static Map[],Pool> pools = new HashMap[], Pool>(); + private static Map[],Pool> pools = new HashMap<>(); private Class cls; private Schema schema; diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/util/Pool.java b/misc/env/src/main/java/org/onap/aaf/misc/env/util/Pool.java index 1694a011..82f05b4a 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/util/Pool.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/util/Pool.java @@ -104,7 +104,7 @@ public class Pool { public Pool(Creator creator) { count = spares = 0; this.creator = creator; - list = new LinkedList>(); + list = new LinkedList<>(); } /** diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/util/RefreshableThreadObject.java b/misc/env/src/main/java/org/onap/aaf/misc/env/util/RefreshableThreadObject.java index 56cd54e5..6892a4b5 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/util/RefreshableThreadObject.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/util/RefreshableThreadObject.java @@ -69,7 +69,7 @@ public class RefreshableThreadObject> { * @throws APIException */ public RefreshableThreadObject(Class clss) throws APIException { - objs = new ConcurrentHashMap(); + objs = new ConcurrentHashMap<>(); try { cnst = clss.getConstructor(new Class[]{Env.class} ); } catch (Exception e) { diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/InXML.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/InXML.java index 48275926..da66394c 100644 --- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/InXML.java +++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/InXML.java @@ -205,7 +205,7 @@ public class InXML implements Parse { String value = sb.toString(); sb.setLength(0); if(tag !=null && value != null) { - if(props==null)props = new ArrayList(); + if(props==null)props = new ArrayList<>(); props.add(new Prop(tag,value)); } } @@ -251,7 +251,7 @@ public class InXML implements Parse { public void push(Prop prop) { if(attribs==null) { - attribs = new ArrayList(); + attribs = new ArrayList<>(); idx = 0; } attribs.add(prop); @@ -291,7 +291,7 @@ public class InXML implements Parse { private void addNS(Prop prop) { Map existingNS = getNS(); - if(ns==null)ns = new HashMap(); + if(ns==null)ns = new HashMap<>(); // First make a copy of previous NSs so that we have everything we need, but can overwrite, if necessary if(existingNS!=null && ns!=existingNS) { ns.putAll(ns); diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/JaxInfo.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/JaxInfo.java index 5f38c8c7..6c20ba25 100644 --- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/JaxInfo.java +++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/JaxInfo.java @@ -74,7 +74,7 @@ public class JaxInfo { JaxInfo derived; // Lazy Instantiation if(extensions == null) { - extensions = new HashMap(); + extensions = new HashMap<>(); derived = null; } else { derived = extensions.get(derivedName); @@ -163,7 +163,7 @@ public class JaxInfo { // Build up Method names from JAXB Annotations XmlType xt; while((xt = cls.getAnnotation(XmlType.class))!=null) { - if(fields==null)fields = new ArrayList(); + if(fields==null)fields = new ArrayList<>(); for(String field : xt.propOrder()) { if("".equals(field)) break; // odd bug. "" returned when no fields exist, rather than empty array Field rf = cls.getDeclaredField(field); diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/JaxSet.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/JaxSet.java index bb6784c8..04d61581 100644 --- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/JaxSet.java +++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/JaxSet.java @@ -38,11 +38,11 @@ import javax.xml.bind.annotation.XmlType; * @param */ public class JaxSet { - private static Map,JaxSet> jsets = new HashMap,JaxSet>(); + private static Map,JaxSet> jsets = new HashMap<>(); private Map> members; private JaxSet(Class cls) { - members = new TreeMap>(); + members = new TreeMap<>(); XmlType xmltype = cls.getAnnotation(XmlType.class); Class paramType[] = new Class[] {String.class}; for(String str : xmltype.propOrder()) { @@ -79,7 +79,7 @@ public class JaxSet { @SuppressWarnings("unchecked") JaxSet js = (JaxSet)jsets.get(cls); if(js == null) { - jsets.put(cls, js = new JaxSet(cls)); + jsets.put(cls, js = new JaxSet<>(cls)); } return js; } diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutXML.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutXML.java index f3ce1c22..8557c584 100644 --- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutXML.java +++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutXML.java @@ -42,7 +42,7 @@ public class OutXML extends Out{ public OutXML(String root, String ... params) { this.root = root; - props = new ArrayList(); + props = new ArrayList<>(); for(String p : params) { String[] tv=p.split("="); if(tv.length==2) @@ -164,7 +164,7 @@ public class OutXML extends Out{ } if(create && !rv) { - if(nses == null) nses = new HashMap(); + if(nses == null) nses = new HashMap<>(); nses.put(ns, value); } return rv; diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/XmlEscape.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/XmlEscape.java index f1cde6e5..aac1e30f 100644 --- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/XmlEscape.java +++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/XmlEscape.java @@ -106,8 +106,8 @@ public class XmlEscape { } static { - charMap = new TreeMap(); - intMap = new TreeMap(); + charMap = new TreeMap<>(); + intMap = new TreeMap<>(); charMap.put("quot", 34); charMap.put("amp",38); charMap.put("apos",39); diff --git a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/CacheGen.java b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/CacheGen.java index 74b590da..417f80b7 100644 --- a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/CacheGen.java +++ b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/CacheGen.java @@ -42,7 +42,7 @@ public abstract class CacheGen> { public final static int HTML5 = 0x8; - private ArrayList> sections = new ArrayList>(); + private ArrayList> sections = new ArrayList<>(); private int flags; private final Thematic thematic; diff --git a/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/html/JU_HTML4GenTest.java b/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/html/JU_HTML4GenTest.java index 18b33938..9160095d 100644 --- a/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/html/JU_HTML4GenTest.java +++ b/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/html/JU_HTML4GenTest.java @@ -60,7 +60,7 @@ public class JU_HTML4GenTest { gen.html("attributes"); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : DOCTYPE.toCharArray()) { Integer times = map.get(ch); map.put(ch, (times == null ? 0 : times) + 1); @@ -84,7 +84,7 @@ public class JU_HTML4GenTest { gen.head(); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : "head".toCharArray()) { Integer times = map.get(ch); @@ -103,7 +103,7 @@ public class JU_HTML4GenTest { gen.body("attributes"); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : "body".toCharArray()) { Integer times = map.get(ch); @@ -126,7 +126,7 @@ public class JU_HTML4GenTest { gen.charset(charset); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : CHARSET_LINE.toCharArray()) { Integer times = map.get(ch); @@ -145,7 +145,7 @@ public class JU_HTML4GenTest { gen.header("attributes"); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : "header".toCharArray()) { Integer times = map.get(ch); @@ -174,7 +174,7 @@ public class JU_HTML4GenTest { gen.footer("attributes"); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : "footer".toCharArray()) { Integer times = map.get(ch); @@ -203,7 +203,7 @@ public class JU_HTML4GenTest { gen.section("attributes"); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : "section".toCharArray()) { Integer times = map.get(ch); @@ -232,7 +232,7 @@ public class JU_HTML4GenTest { gen.article("attributes"); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : "attrib".toCharArray()) { Integer times = map.get(ch); @@ -261,7 +261,7 @@ public class JU_HTML4GenTest { gen.aside("attributes"); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : "aside".toCharArray()) { Integer times = map.get(ch); @@ -290,7 +290,7 @@ public class JU_HTML4GenTest { gen.nav("attributes"); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : "nav".toCharArray()) { Integer times = map.get(ch); diff --git a/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/html/JU_HTML5GenTest.java b/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/html/JU_HTML5GenTest.java index 953a4a3b..69ebf89b 100644 --- a/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/html/JU_HTML5GenTest.java +++ b/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/html/JU_HTML5GenTest.java @@ -36,8 +36,8 @@ import org.mockito.Mock; public class JU_HTML5GenTest { - private final static String DOCTYPE = ""; +// private final static String DOCTYPE = ""; private String charset = "utf-8"; @@ -59,7 +59,7 @@ public class JU_HTML5GenTest { gen.html("attributes"); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : "html".toCharArray()) { Integer times = map.get(ch); @@ -79,7 +79,7 @@ public class JU_HTML5GenTest { gen.head(); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : "head".toCharArray()) { Integer times = map.get(ch); @@ -98,7 +98,7 @@ public class JU_HTML5GenTest { gen.body("attributes"); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : "body".toCharArray()) { Integer times = map.get(ch); @@ -121,7 +121,7 @@ public class JU_HTML5GenTest { gen.charset(charset); - Map map = new TreeMap(); + Map map = new TreeMap<>(); for (char ch : CHARSET_LINE.toCharArray()) { Integer times = map.get(ch); diff --git a/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/xml/JU_XMLGenTest.java b/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/xml/JU_XMLGenTest.java index 2dbc422a..1c00b452 100644 --- a/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/xml/JU_XMLGenTest.java +++ b/misc/xgen/src/test/java/org/onap/aaf/misc/xgen/xml/JU_XMLGenTest.java @@ -41,7 +41,7 @@ public class JU_XMLGenTest { String XML_TAG = ""; - Map map = new TreeMap(); + Map map = new TreeMap<>(); @Before public void setUp() throws Exception { -- cgit 1.2.3-korg