initial cleanup in helpers and custom collections,

minor updates to dbws

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>

dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/keymappings/KeyMappingsTestSuite.java

@@ -731,7 +731,6 @@ public void getAllEmployees() {
             comparer.isNodeEqual(controlDoc, doc));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void buildEmployees() {
         XMLUnmarshaller unMarshaller = xrService.getXMLContext().createUnmarshaller();

dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/relationships/RelationshipsEmployee.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,8 +33,8 @@ public class RelationshipsEmployee {
     public String gender;
     public BigDecimal salary;
     public RelationshipsAddress address;
-    public Collection<RelationshipsPhone> phones = new ArrayList<RelationshipsPhone>();
-    public Collection<String> responsibilities = new ArrayList<String>();
+    public Collection<RelationshipsPhone> phones = new ArrayList<>();
+    public Collection<String> responsibilities = new ArrayList<>();
 
     public RelationshipsEmployee() {
     }

dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/xrdynamicentity/XRDynamicEntityTestSuite.java

@@ -50,7 +50,7 @@ public class XRDynamicEntityTestSuite {
     @BeforeClass
     public static void setUp() throws NoSuchFieldException, IllegalArgumentException,
         IllegalAccessException {
-        Set<String> propertyNames = new HashSet<String>();
+        Set<String> propertyNames = new HashSet<>();
         propertyNames.add(FIELD_1);
         propertyNames.add(FIELD_2);
         XRCustomer.DPM.setPropertyNames(propertyNames);
@@ -95,7 +95,7 @@ public void buildTestEntity() throws ReflectiveOperationException {
             (Class<XRDynamicEntity>)xrdcl.createDynamicClass(TEST_CLASSNAME);
         XRDynamicEntity newInstance = testClass.getConstructor().newInstance();
         XRDynamicPropertiesManager xrDPM = newInstance.fetchPropertiesManager();
-        Set<String> propertyNames = new HashSet<String>();
+        Set<String> propertyNames = new HashSet<>();
         propertyNames.add(FIELD_1);
         propertyNames.add(FIELD_2);
         xrDPM.setPropertyNames(propertyNames);

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/ProviderHelper.java

@@ -183,7 +183,7 @@ protected InputStream initXRServiceStream(ClassLoader parentClassLoader,
     }
 
     protected InputStream initXRSchemaStream(ClassLoader parentClassLoader, ServletContext sc) {
-        InputStream xrSchemaStream = null;
+        InputStream xrSchemaStream;
         String path = WSDL_DIR + DBWS_SCHEMA_XML;
         if (sc != null) {
             path = "/" + WEB_INF_DIR + path;
@@ -200,7 +200,7 @@ protected InputStream initXRSchemaStream(ClassLoader parentClassLoader, ServletC
     }
 
     protected InputStream initWSDLInputStream(ClassLoader parentClassLoader, ServletContext sc) {
-        InputStream wsdlInputStream = null;
+        InputStream wsdlInputStream;
         String path = WSDL_DIR + DBWS_WSDL;
         if (sc != null) {
             path = "/" + WEB_INF_DIR + path;
@@ -430,11 +430,11 @@ public SOAPMessage invoke(SOAPMessage request) {
         if (mtomEnabled) {
             attachments = (Map<String, DataHandler>)mc.get(INBOUND_MESSAGE_ATTACHMENTS);
         }
-        SOAPMessage response = null;
-        boolean usesSOAP12 = false;
+        SOAPMessage response;
+        boolean usesSOAP12;
         DBWSAdapter dbwsAdapter = (DBWSAdapter)xrService;
 
-        SOAPEnvelope envelope = null;
+        SOAPEnvelope envelope;
         try {
             envelope = request.getSOAPPart().getEnvelope();
         }
@@ -454,15 +454,15 @@ public SOAPMessage invoke(SOAPMessage request) {
         }
 
         if (body == null) {
-            SOAPFault soapFault = null;
+            SOAPFault soapFault;
             try {
-                SOAPFactory soapFactory = null;
+                SOAPFactory soapFactory;
                 if (usesSOAP12) {
                     soapFactory = SOAPFactory.newInstance(SOAP_1_2_PROTOCOL);
                 } else {
                     soapFactory = SOAPFactory.newInstance();
                 }
-                QName faultCodeQName = null;
+                QName faultCodeQName;
                 if (usesSOAP12) {
                     faultCodeQName = SENDER_QNAME;
                 } else {
@@ -475,7 +475,7 @@ public SOAPMessage invoke(SOAPMessage request) {
             throw new SOAPFaultException(soapFault);
         }
 
-        XMLRoot xmlRoot = null;
+        XMLRoot xmlRoot;
         try {
             XMLContext xmlContext = dbwsAdapter.getXMLContext();
             XMLUnmarshaller unmarshaller = xmlContext.createUnmarshaller();
@@ -529,15 +529,15 @@ public byte[] getAttachmentAsByteArray(String id) {
             xmlRoot = (XMLRoot)unmarshaller.unmarshal(body, Invocation.class);
         }
         catch (Exception e) {
-            SOAPFault soapFault = null;
+            SOAPFault soapFault;
             try {
-                SOAPFactory soapFactory = null;
+                SOAPFactory soapFactory;
                 if (usesSOAP12) {
                     soapFactory = SOAPFactory.newInstance(SOAP_1_2_PROTOCOL);
                 } else {
                     soapFactory = SOAPFactory.newInstance();
                 }
-                QName faultCodeQName = null;
+                QName faultCodeQName;
                 if (usesSOAP12) {
                     faultCodeQName = SENDER_QNAME;
                 } else {
@@ -606,7 +606,7 @@ public byte[] getAttachmentAsByteArray(String id) {
               // incoming attachments ?
             }
         }
-        Object result = null;
+        Object result;
         try {
             result = op.invoke(dbwsAdapter, invocation);
             if (result instanceof ValueObject) {
@@ -622,15 +622,15 @@ public byte[] getAttachmentAsByteArray(String id) {
                 response = responseWriter.generateResponse(op, usesSOAP12, e);
             }
             catch (SOAPException soape1) {
-                SOAPFault soapFault = null;
+                SOAPFault soapFault;
                 try {
-                    SOAPFactory soapFactory = null;
+                    SOAPFactory soapFactory;
                     if (usesSOAP12) {
                         soapFactory = SOAPFactory.newInstance(SOAP_1_2_PROTOCOL);
                     } else {
                         soapFactory = SOAPFactory.newInstance();
                     }
-                    QName faultCodeQName = null;
+                    QName faultCodeQName;
                     if (usesSOAP12) {
                         faultCodeQName = RECEIVER_QNAME;
                     } else {

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/SOAPAttachmentHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,7 +37,7 @@
 public class SOAPAttachmentHandler implements XMLAttachmentMarshaller {
 
     private int count = 0;
-    private HashMap<String, DataHandler> attachments = new HashMap<String,DataHandler>();
+    private HashMap<String, DataHandler> attachments = new HashMap<>();
 
     public boolean hasAttachments() {
         return attachments.size() > 0;

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/SOAPResponseWriter.java

@@ -58,7 +58,7 @@
 public class SOAPResponseWriter {
 
     protected DBWSAdapter dbwsAdapter;
-    protected Map<String, XMLDescriptor> resultDescriptors = new HashMap<String, XMLDescriptor>();
+    protected Map<String, XMLDescriptor> resultDescriptors = new HashMap<>();
     public static final QName RECEIVER_QNAME = new QName(URI_NS_SOAP_1_2_ENVELOPE, "Receiver");
     public static final QName SERVER_QNAME = new QName(URI_NS_SOAP_1_1_ENVELOPE, "Server");
 

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Descriptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,9 +26,9 @@ public class Descriptor {
 
     protected String name = null;
     protected String type = null;
-    protected List<LinkTemplate> linkTemplates = new ArrayList<LinkTemplate>();
-    protected List<Attribute> attributes = new ArrayList<Attribute>();
-    protected List<Query> queries = new ArrayList<Query>();
+    protected List<LinkTemplate> linkTemplates = new ArrayList<>();
+    protected List<Attribute> attributes = new ArrayList<>();
+    protected List<Query> queries = new ArrayList<>();
 
     public String getName() {
         return name;

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/ItemLinks.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,7 +43,7 @@ public List<LinkV2> getLinks() {
      */
     public void setLinks(List<LinkV2> links) {
         if (this.links == null) {
-            this.links = new ArrayList<LinkV2>();
+            this.links = new ArrayList<>();
         }
 
         this.links = links;
@@ -56,7 +56,7 @@ public void setLinks(List<LinkV2> links) {
      */
     public void addLink(LinkV2 link) {
         if (this.links == null) {
-            this.links = new ArrayList<LinkV2>();
+            this.links = new ArrayList<>();
         }
 
         this.links.add(link);

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/PersistenceUnit.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,7 +25,7 @@
 public class PersistenceUnit {
 
     protected String persistenceUnitName = null;
-    protected List<Link> types = new ArrayList<Link>();
+    protected List<Link> types = new ArrayList<>();
 
     public String getPersistenceUnitName() {
         return persistenceUnitName;

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Query.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +26,7 @@ public class Query {
     protected String queryName;
     protected String jpql;
     protected LinkTemplate linkTemplate;
-    protected List<String> returnTypes = new ArrayList<String>();
+    protected List<String> returnTypes = new ArrayList<>();
 
     public Query() {
     }

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/SessionBeanCall.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ public class SessionBeanCall {
     private String jndiName = null;
     private String methodName = null;
     private String context = null;
-    private List<Parameter> parameters = new ArrayList<Parameter>();
+    private List<Parameter> parameters = new ArrayList<>();
 
     public String getContext() {
         return context;

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ContextsCatalog.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,7 +45,7 @@ public void setItems(List<Resource> items) {
      */
     public void addContext(Resource context) {
         if (items == null) {
-            items = new ArrayList<Resource>();
+            items = new ArrayList<>();
         }
         items.add(context);
     }

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/MetadataCatalog.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,7 +54,7 @@ public void setLinks(List<LinkV2> links) {
 
     public void addResource(Resource resource) {
         if (items == null) {
-            items = new ArrayList<Resource>();
+            items = new ArrayList<>();
         }
         items.add(resource);
     }

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ResourceSchema.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -108,23 +108,23 @@ public void setLinks(List<LinkV2> links) {
 
     public void addProperty(String name, Property property) {
         if (properties == null) {
-            properties = new ArrayList<JAXBElement>();
+            properties = new ArrayList<>();
         }
-        properties.add(new JAXBElement<Property>(new QName(name), Property.class, property));
+        properties.add(new JAXBElement<>(new QName(name), Property.class, property));
     }
 
     public void addDefinition(String name, ResourceSchema definition) {
         // Lazy initialization
         if (definitions == null) {
-            definitions = new ArrayList<JAXBElement>(1);
+            definitions = new ArrayList<>(1);
         }
-        definitions.add(new JAXBElement<ResourceSchema>(new QName(name), ResourceSchema.class, definition));
+        definitions.add(new JAXBElement<>(new QName(name), ResourceSchema.class, definition));
     }
 
     public void addAllOf(Reference reference) {
         // Lazy initialization
         if (allOf == null) {
-            allOf = new ArrayList<Reference>(1);
+            allOf = new ArrayList<>(1);
         }
         allOf.add(reference);
     }

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/DeleteOperation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,7 +40,6 @@
  * @author Mike Norman - michael.norman@oracle.com
  * @since EclipseLink 1.x
  */
-@SuppressWarnings({"unchecked"})
 public class DeleteOperation extends Operation {
     protected String descriptorName;
     protected ClassDescriptor classDescriptor;
@@ -127,11 +126,11 @@ public Object invoke(XRServiceAdapter xrService, Invocation invocation) {
             // set query args or execute args for the non-JPAQuery case,
             // i.e. stored proc/funcs get populated from ORM metadata
             // whereas named queries (SQL strings) do not...
-            List queryArguments = query.getArguments();
+            List<String> queryArguments = query.getArguments();
             int queryArgumentsSize = queryArguments.size();
-            Vector executeArguments = new NonSynchronizedVector();
+            Vector<Object> executeArguments = new NonSynchronizedVector<>();
             for (int i = 0; i < queryArgumentsSize; i++) {
-                String argName = (String)queryArguments.get(i);
+                String argName = queryArguments.get(i);
                 executeArguments.add(invocation.getParameter(argName));
             }
             toBeDeleted = uow.executeQuery(query, executeArguments);

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Invocation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,7 +34,7 @@
 public class Invocation {
 
     protected String name;
-    protected Map<String, Object> parameters = new HashMap<String, Object>();
+    protected Map<String, Object> parameters = new HashMap<>();
 
     public Invocation() {
         super();

dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Operation.java

@@ -35,7 +35,7 @@
 public abstract class Operation {
 
     protected String name;
-    protected List<Parameter> parameters = new ArrayList<Parameter>();
+    protected List<Parameter> parameters = new ArrayList<>();
 
     /**
      * <p><b>INTERNAL</b>: