WINDUP-3317 Additional classpath JAR additions (#645)

windup · Mar 29, 2022 · df83b59 · df83b59
1 parent 1252b79
commit df83b59
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/rules-reviewed/openjdk11/api-jars/removed-classes.jar b/rules-reviewed/openjdk11/api-jars/removed-classes.jar
diff --git a/rules-reviewed/openjdk11/openjdk8/java-removals.windup.xml b/rules-reviewed/openjdk11/openjdk8/java-removals.windup.xml
@@ -158,17 +158,20 @@
                 <matches pattern="(getInt|putInt|getFloat|putFloat|getDouble|putDouble|getBoolean|putBoolean|getObject|putObject|getByte|putByte|getChar|putChar|getShort|putShort|getLong|putLong|fieldOffset|staticFieldBase|tryMonitorEnter|monitorEnter|monitorExit)"/>
             </where>
         </rule>
-        <rule id="java-removals-00101">
+        <rule id="java-removals-00120">
             <when>
                 <javaclass references="sun.misc.BASE64{encoder-decoder}{*}"/>
             </when>
             <perform>
                 <hint title="The `sun.misc.BASE64{encoder-decoder}` class has been removed" effort="1" category-id="mandatory">
                     <message>
-                        The `sun.misc.BASE64{encoder-decoder}` class has been removed. Replace with `java.util.Base64.getMime{encoder-decoder}`.
+                        The `sun.misc.BASE64{encoder-decoder}` class has been removed.  
+                        It can be replaced with `Base64.{encoder-decoder}` class instantiated using `java.util.Base64.getMime{encoder-decoder}()` method.  
+                        For further examples on how to replace the `BASE64{encoder-decoder}` class with `Base64.{encoder-decoder}` one, refer to the "Code example" link below.  
                     </message>
+                    <link title="java.util.Base64 - Javadoc" href="https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/Base64.html"/>
                     <link title="Code example" href="https://hg.openjdk.java.net/jdk8/jdk8/jdk/rev/9078c34437ab"/>
-                    <link title="Original enhancement request" href="https://bugs.openjdk.java.net/browse/JDK-8006182"/>
+                    <link title="OpenJDK - Original enhancement request" href="https://bugs.openjdk.java.net/browse/JDK-8006182"/>
                 </hint>
             </perform>
             <where param="encoder-decoder">

diff --git a/rules-reviewed/openjdk11/openjdk8/tests/data/java-removals/Base64Removals.java b/rules-reviewed/openjdk11/openjdk8/tests/data/java-removals/Base64Removals.java
@@ -1,17 +1,19 @@
 package com.test.project;
 
-import sun.misc.BASE64Decoder;
+import sun.misc.*;
 import sun.misc.BASE64Encoder;
 
 import java.io.IOException;
 
 public class Base64Removals {
     public static void main(String[] args) {
-        BASE64Encoder base64Encoder = new BASE64Encoder();
+        BASE64Encoder base64Encoder;
+        base64Encoder = new BASE64Encoder();
         BASE64Decoder base64Decoder = new BASE64Decoder();
 
         try {
             base64Decoder.decodeBuffer("inputString");
+            base64Decoder.bytesPerAtom();
             base64Encoder.encodeBuffer(new byte[]{'a', 'b'});
         } catch (IOException e) {
             e.printStackTrace();

diff --git a/rules-reviewed/openjdk11/openjdk8/tests/java-removals.windup.test.xml b/rules-reviewed/openjdk11/openjdk8/tests/java-removals.windup.test.xml
@@ -56,28 +56,28 @@
                     <fail message="[java-removals] `java-removals-00030-test failed"/>
                 </perform>
             </rule>
-            <rule id="java-removals-00101-test">
+            <rule id="java-removals-00120-test-0">
                 <when>
                     <not>
-                        <iterable-filter size="4">
+                        <iterable-filter size="3">
                             <hint-exists message="The `sun.misc.BASE64Encoder` class has been removed*"/>
                         </iterable-filter>
                     </not>
                 </when>
                 <perform>
-                    <fail message="[java-removals] `java-removals-00101-test failed"/>
+                    <fail message="[java-removals] sun.misc.BASE64Encoder hints not found"/>
                 </perform>
             </rule>
-            <rule id="java-removals-00101-test-2">
+            <rule id="java-removals-00120-test-1">
                 <when>
                     <not>
-                        <iterable-filter size="4">
+                        <iterable-filter size="3">
                             <hint-exists message="The `sun.misc.BASE64Decoder` class has been removed*"/>
                         </iterable-filter>
                     </not>
                 </when>
                 <perform>
-                    <fail message="[java-removals] `java-removals-00101-test-2 failed"/>
+                    <fail message="[java-removals] sun.misc.BASE64Decoder hints not found"/>
                 </perform>
             </rule>
         </rules>