warnings in core/oxm/schema, jpa/parser, helpers (#1317)

* warnings in core/oxm/schema, jpa/parser, helpers (changes applied through the codebase) * attempt to harden modules with no warnings, warning means compile-time error here Signed-off-by: Lukas Jungmann <[email protected]>
eclipse-ee4j · Sep 22, 2021 · 3e2c7e5 · 3e2c7e5
1 parent 08e6244
commit 3e2c7e5
Show file tree

Hide file tree

Showing 286 changed files with 1,326 additions and 2,006 deletions.
diff --git a/bundles/tests/pom.xml b/bundles/tests/pom.xml
@@ -31,6 +31,10 @@
     <packaging>jar</packaging>
 
     <properties>
+        <comp.xlint>-Xlint:all</comp.xlint>
+        <comp.xdoclint>-Xdoclint:all,-missing</comp.xdoclint>
+        <comp.test.xlint>-Xlint:all</comp.test.xlint>
+
         <!--Test properties-->
         <archive.tmp.dir>archive-tmp</archive.tmp.dir>
         <eclipselink.unzip.dir>${project.build.directory}/stage</eclipselink.unzip.dir>
@@ -86,16 +90,16 @@
             <artifactId>parsson</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.corba</groupId>
-            <artifactId>glassfish-corba-omgapi</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.corba</groupId>
-            <artifactId>glassfish-corba-orb</artifactId>
-            <scope>test</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.glassfish.corba</groupId>-->
+<!--            <artifactId>glassfish-corba-omgapi</artifactId>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.glassfish.corba</groupId>-->
+<!--            <artifactId>glassfish-corba-orb</artifactId>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -174,6 +178,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>-Werror</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

diff --git a/...src/test/java/org/eclipse/persistence/testing/osgi/beanvalidation/BeanValidationTest.java b/...src/test/java/org/eclipse/persistence/testing/osgi/beanvalidation/BeanValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -63,7 +63,7 @@ public static Option[] config() {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        Class[] classes = new Class[1];
+        Class<?>[] classes = new Class<?>[1];
         classes[0] = Customer.class;
         jaxbContext = JAXBContextFactory.createContext(classes, null);
     }

diff --git a/...c/test/java/org/eclipse/persistence/testing/osgi/beanvalidation/NoBeanValidationTest.java b/...c/test/java/org/eclipse/persistence/testing/osgi/beanvalidation/NoBeanValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -52,7 +52,7 @@ public static Option[] config() {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        Class[] classes = new Class[1];
+        Class<?>[] classes = new Class<?>[1];
         classes[0] = Customer.class;
         jaxbContext = JAXBContextFactory.createContext(classes, null);
     }

diff --git a/dbws/eclipselink.dbws.test.oracle/pom.xml b/dbws/eclipselink.dbws.test.oracle/pom.xml
@@ -31,6 +31,10 @@
     </parent>
 
     <properties>
+        <comp.xlint>-Xlint:all</comp.xlint>
+        <comp.xdoclint>-Xdoclint:all,-missing</comp.xdoclint>
+        <comp.test.xlint>-Xlint:all</comp.test.xlint>
+
         <test-skip-dbws-oracle>${skipTests}</test-skip-dbws-oracle>
     </properties>
 
@@ -79,6 +83,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>-Werror</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

diff --git a/...k.dbws.test.oracle/src/it/java/dbws/testing/plsqlcollection/PLSQLcollectionTestSuite.java b/...k.dbws.test.oracle/src/it/java/dbws/testing/plsqlcollection/PLSQLcollectionTestSuite.java
@@ -55,7 +55,6 @@
 import org.eclipse.persistence.queries.DatabaseQuery;
 import org.eclipse.persistence.sessions.DatabaseLogin;
 import org.eclipse.persistence.sessions.DatabaseSession;
-import org.eclipse.persistence.sessions.DatasourceLogin;
 import org.eclipse.persistence.sessions.Project;
 import org.eclipse.persistence.sessions.Session;
 import org.eclipse.persistence.sessions.factories.XMLProjectReader;
@@ -292,7 +291,7 @@ public void fromProjectXML() {
         Class<?> t1Clz = t1Descriptor.getJavaClass();
         ((DatabaseSession)session).login();
         String[] elements = {"first string", "second string", "third string"};
-        NonSynchronizedVector queryArgs = new NonSynchronizedVector();
+        NonSynchronizedVector<Object> queryArgs = new NonSynchronizedVector<>();
         queryArgs.add(elements);
         queryArgs.add("barf");
         boolean worked = false;

diff --git a/....persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/ProviderHelper.java b/....persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/ProviderHelper.java
@@ -564,16 +564,15 @@ public byte[] getAttachmentAsByteArray(String id) {
          * binary objects, we must convert
          */
         org.eclipse.persistence.internal.oxm.schema.model.Element invocationElement =
-          (org.eclipse.persistence.internal.oxm.schema.model.Element)
-           dbwsAdapter.getExtendedSchema().getTopLevelElements().get(invocation.getName());
+                dbwsAdapter.getExtendedSchema().getTopLevelElements().get(invocation.getName());
         String typeName = invocationElement.getType();
         int idx = typeName.indexOf(':');
         if (idx != -1) {
           // strip-off any namespace prefix
           typeName = typeName.substring(idx+1);
         }
         ComplexType complexType =
-          (ComplexType)dbwsAdapter.getExtendedSchema().getTopLevelComplexTypes().get(typeName);
+                dbwsAdapter.getExtendedSchema().getTopLevelComplexTypes().get(typeName);
         if (complexType.getSequence() != null) {
             // for each operation, there is a corresponding top-level Request type
             // which has the arguments to the operation

diff --git a/...istence.corba/src/it/java/org/eclipse/persistence/testing/tests/corba/CorbaTestModel.java b/...istence.corba/src/it/java/org/eclipse/persistence/testing/tests/corba/CorbaTestModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -46,7 +46,7 @@ public void addTests() {
 
         for (int index = 0; index < tests.size(); ++index) {
             try {
-                addTest((TestModel) Class.forName(tests.get(index)).newInstance());
+                addTest((TestModel) Class.forName(tests.get(index)).getConstructor().newInstance());
             } catch (Throwable exception) {
                 System.out.println("Failed to set up " + tests.get(index) + " \n" + exception);
                 // exception.printStackTrace();

diff --git a/...ore.test.framework/src/main/java/org/eclipse/persistence/tools/history/HistoryFacade.java b/...ore.test.framework/src/main/java/org/eclipse/persistence/tools/history/HistoryFacade.java
@@ -36,7 +36,7 @@
  */
 public class HistoryFacade {
 
-    private static Map timeOffsetsMap = new IdentityHashMap();
+    private static Map<Session, Long> timeOffsetsMap = new IdentityHashMap<>();
 
     protected HistoryFacade() {
     }
@@ -62,7 +62,7 @@ protected static void buildHistoricalTableDefinition(HistoryPolicy policy,
         fieldDef.setType(ClassConstants.TIMESTAMP);
         fieldDef.setSize(6);
         histDef.addField(fieldDef);
-        histDef.setForeignKeys(new Vector());
+        histDef.setForeignKeys(new Vector<>());
 
         for (FieldDefinition fieldDef2 : histDef.getFields()) {
             // For now foreign key constraints are not supported, because shallow inserts are not...
@@ -107,7 +107,7 @@ public static long currentDatabaseTimeMillis(org.eclipse.persistence.sessions.Se
             }
         }
         if (timeOffsetsMap.containsKey(rootSession)) {
-            Long offset = (Long)timeOffsetsMap.get(rootSession);
+            Long offset = timeOffsetsMap.get(rootSession);
             return System.currentTimeMillis() + offset;
         } else {
             DatabaseQuery query =
@@ -132,11 +132,11 @@ public static long currentDatabaseTimeMillis(org.eclipse.persistence.sessions.Se
     public static void generateHistoricalTableDefinitions(TableCreator creator, Session session) {
 
         // First add all table definitions to a hashtable.
-        Map<String, TableDefinition> tableDefinitions = new HashMap(creator.getTableDefinitions().size());
+        Map<String, TableDefinition> tableDefinitions = new HashMap<>(creator.getTableDefinitions().size());
         for (TableDefinition def : creator.getTableDefinitions()) {
             tableDefinitions.put(def.getFullName(), def);
         }
-        Set<String> generatedTables = new HashSet<String>();
+        Set<String> generatedTables = new HashSet<>();
         for (ClassDescriptor descriptor : session.getDescriptors().values()) {
             HistoryPolicy policy = descriptor.getHistoryPolicy();
             if (policy != null) {
@@ -188,15 +188,15 @@ public static void generateHistoricalTableDefinitions(TableCreator creator, Sess
      * being the current table name with a _HIST suffix.  Hence Employee would
      * become Employee_Hist.
      */
-    public static void generateHistoryPolicies(Iterator descriptors, DatasourcePlatform platform) {
+    public static void generateHistoryPolicies(Iterator<ClassDescriptor> descriptors, DatasourcePlatform platform) {
         HistoryPolicy basePolicy = new HistoryPolicy();
         basePolicy.addStartFieldName("ROW_START");
         basePolicy.addEndFieldName("ROW_END");
 
         HistoryPolicy policy = null;
 
         while (descriptors.hasNext()) {
-            ClassDescriptor descriptor = (ClassDescriptor)descriptors.next();
+            ClassDescriptor descriptor = descriptors.next();
             policy = (HistoryPolicy)basePolicy.clone();
             List<DatabaseTable> tables = descriptor.getTables();
             int size = tables.size();

diff --git a/...ersistence.core/src/main/java/org/eclipse/persistence/core/queries/CoreAttributeItem.java b/...ersistence.core/src/main/java/org/eclipse/persistence/core/queries/CoreAttributeItem.java
@@ -104,7 +104,7 @@ public void addSubGroup(ATTRIBUTE_GROUP group) {
             if (this.group == null){
                 this.group = group;
             }
-            Object type = group.getType();
+            Serializable type = group.getType();
             if (type == null){
                 type = group.getTypeName();
             }
@@ -202,9 +202,9 @@ public boolean equals(Object obj) {
             if(obj == null) {
                 return false;
             }
-            CoreAttributeItem anotherItem = null;
+            CoreAttributeItem<ATTRIBUTE_GROUP> anotherItem = null;
             try {
-                anotherItem = (CoreAttributeItem)obj;
+                anotherItem = (CoreAttributeItem<ATTRIBUTE_GROUP>)obj;
             } catch (ClassCastException cce) {
                 return false;
             }
@@ -215,7 +215,7 @@ public boolean equals(Object obj) {
                 }
                 if (this.subGroups.size() == anotherItem.subGroups.size()){
                     for (Map.Entry<Object, ATTRIBUTE_GROUP> entry : this.subGroups.entrySet()){
-                        ATTRIBUTE_GROUP anotherGroup = (ATTRIBUTE_GROUP)anotherItem.subGroups.get(entry.getKey());
+                        ATTRIBUTE_GROUP anotherGroup = anotherItem.subGroups.get(entry.getKey());
                         if (! entry.getValue().equals(anotherGroup)){
                             return false;
                         }
@@ -233,7 +233,7 @@ public boolean equals(Object obj) {
                 }
                 if (this.keyGroups.size() == anotherItem.keyGroups.size()){
                     for (Map.Entry<Object, ATTRIBUTE_GROUP> entry : this.keyGroups.entrySet()){
-                        ATTRIBUTE_GROUP anotherGroup = (ATTRIBUTE_GROUP)anotherItem.keyGroups.get(entry.getKey());
+                        ATTRIBUTE_GROUP anotherGroup = anotherItem.keyGroups.get(entry.getKey());
                         if (! entry.getValue().equals(anotherGroup)){
                             return false;
                         }
@@ -344,10 +344,10 @@ public void setRootGroup(ATTRIBUTE_GROUP group) {
 
     @Override
     public String toString() {
-        return getClass().getSimpleName() + "(" + getAttributeName() + ")" + (this.subGroups!=null ? " => " + this.subGroups.toString() : "") + (this.keyGroups!=null ? " => " + this.keyGroups.toString() : "");
+        return getClass().getSimpleName() + "(" + getAttributeName() + ")" + (this.subGroups!=null ? " => " + this.subGroups : "") + (this.keyGroups!=null ? " => " + this.keyGroups : "");
     }
 
     public String toStringNoClassName() {
-        return getAttributeName() + (this.subGroups!=null ? " => " + this.subGroups.toString() : "")+ (this.keyGroups!=null ? " => " + this.keyGroups.toString() : "");
+        return getAttributeName() + (this.subGroups!=null ? " => " + this.subGroups : "")+ (this.keyGroups!=null ? " => " + this.keyGroups : "");
     }
 }
diff --git a/...clipse.persistence.core/src/main/java/org/eclipse/persistence/descriptors/CacheIndex.java b/...clipse.persistence.core/src/main/java/org/eclipse/persistence/descriptors/CacheIndex.java
@@ -16,6 +16,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.persistence.internal.helper.ClassConstants;
@@ -43,11 +44,9 @@ public CacheIndex() {
         this.fields = new ArrayList<>();
     }
 
-    public CacheIndex(DatabaseField fields[]) {
+    public CacheIndex(DatabaseField[] fields) {
         this.fields = new ArrayList<>(fields.length);
-        for (DatabaseField field : fields) {
-            this.fields.add(field);
-        }
+        Collections.addAll(this.fields, fields);
     }
 
     public CacheIndex(String... fields) {

diff --git a/...lipse.persistence.core/src/main/java/org/eclipse/persistence/descriptors/CachePolicy.java b/...lipse.persistence.core/src/main/java/org/eclipse/persistence/descriptors/CachePolicy.java
@@ -25,7 +25,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.persistence.Cache;
 import org.eclipse.persistence.annotations.CacheCoordinationType;
 import org.eclipse.persistence.annotations.CacheKeyType;
 import org.eclipse.persistence.annotations.DatabaseChangeNotificationType;
@@ -47,7 +46,6 @@
 import org.eclipse.persistence.mappings.DatabaseMapping;
 import org.eclipse.persistence.sessions.DatabaseSession;
 import org.eclipse.persistence.sessions.interceptors.CacheInterceptor;
-import org.eclipse.persistence.sessions.interceptors.CacheKeyInterceptor;
 
 /**
  * <p><b>Purpose</b>: