Merge pull request #104 from keithc-ca/warnings

Fix warnings in openj9 java code patches

Author: pshipton

src/java.base/share/classes/java/io/ObjectInputStream.java

@@ -366,15 +366,12 @@ private static class Logging {
      * read* requests
      */
 
-    /* ClassByNameCache Entry for caching class.forName results upon enableClassCaching */
-    private static final ClassByNameCache classByNameCache;
-    private static final boolean isClassCachingEnabled;
-    static {
-        isClassCachingEnabled =
+    @SuppressWarnings("removal")
+    private static final boolean isClassCachingEnabled =
             AccessController.doPrivileged(new GetClassCachingSettingAction());
-        classByNameCache = (isClassCachingEnabled ? new ClassByNameCache() : null);
-    }
-  
+    /* ClassByNameCache Entry for caching class.forName results upon enableClassCaching */
+    private static final ClassByNameCache classByNameCache =
+            isClassCachingEnabled ? new ClassByNameCache() : null;
 
     /** if true LUDCL/forName results would be cached, true by default starting Java8 */
     private static final class GetClassCachingSettingAction
@@ -513,12 +510,12 @@ public final Object readObject()
      * latestUserDefinedLoader().
      *
      * @throws  ClassNotFoundException if the class of a serialized object
-     * 	   could not be found.
+     *     could not be found.
      * @throws  IOException if an I/O error occurs.
      *
      */
 
-    private static Object redirectedReadObject(ObjectInputStream iStream, Class caller)
+    private static Object redirectedReadObject(ObjectInputStream iStream, Class<?> caller)
             throws ClassNotFoundException, IOException
     {
         return iStream.readObject(Object.class, caller);
@@ -556,7 +553,7 @@ private String readString() throws IOException {
      * @throws  ClassNotFoundException Class of a serialized object cannot be
      *          found.
      */
-    private final Object readObject(Class<?> type, Class caller)
+    private final Object readObject(Class<?> type, Class<?> caller)
         throws IOException, ClassNotFoundException
     {
         if (enableOverride) {
@@ -567,17 +564,17 @@ private final Object readObject(Class<?> type, Class caller)
             throw new AssertionError("internal error");
 
         ClassLoader oldCachedLudcl = null;
-	    boolean setCached = false;
-	
-	    if (((null == curContext) || refreshLudcl) && (isClassCachingEnabled)) {
+        boolean setCached = false;
+
+        if (((null == curContext) || refreshLudcl) && isClassCachingEnabled) {
             oldCachedLudcl = cachedLudcl;
 
             // If caller is not provided, follow the standard path to get the cachedLudcl.
             // Otherwise use the class loader provided by JIT as the cachedLudcl.
 
             if (caller == null) {
                  cachedLudcl = latestUserDefinedLoader();
-            }else{
+            } else {
                  cachedLudcl = caller.getClassLoader();
             }
 
@@ -693,9 +690,9 @@ protected Object readObjectOverride()
     public Object readUnshared() throws IOException, ClassNotFoundException {
 
         ClassLoader oldCachedLudcl = null;
-        boolean setCached = false; 
+        boolean setCached = false;
 
-        if (((null == curContext) || refreshLudcl) && (isClassCachingEnabled)) {
+        if (((null == curContext) || refreshLudcl) && isClassCachingEnabled) {
             oldCachedLudcl = cachedLudcl;
             cachedLudcl = latestUserDefinedLoader();
             setCached = true;

src/java.base/share/classes/java/lang/String.java

@@ -25,7 +25,7 @@
 
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2021, 2021 All Rights Reserved
+ * (c) Copyright IBM Corp. 2021, 2022 All Rights Reserved
  * ===========================================================================
  */
 
@@ -1854,7 +1854,7 @@ private String(String s1, int v1) {
 			} while (quot != 0);
 
 			if (v1 < 0) {
-				helpers.putCharInArrayByIndex(value, index, (char) '-');
+				helpers.putCharInArrayByIndex(value, index, '-');
 			}
 
 			// Copy in s1 contents
@@ -2013,7 +2013,7 @@ private String(int v1, String s1, int v2, String s2, String s3) {
 			} while (quot2 != 0);
 
 			if (v2 < 0) {
-				helpers.putCharInArrayByIndex(value, index2--, (char) '-');
+				helpers.putCharInArrayByIndex(value, index2--, '-');
 			}
 
 			// Copy in s1 contents
@@ -2040,7 +2040,7 @@ private String(int v1, String s1, int v2, String s2, String s3) {
 			} while (quot1 != 0);
 
 			if (v1 < 0) {
-				helpers.putCharInArrayByIndex(value, index1--, (char) '-');
+				helpers.putCharInArrayByIndex(value, index1--, '-');
 			}
 
 			if (COMPACT_STRINGS) {