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 +- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'misc/env') 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) { -- cgit 1.2.3-korg