mimepull 1.10.0, build plugins,

code cleanup Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · May 9, 2022 · 5956e6a · 5956e6a
1 parent 955d8f8
commit 5956e6a
Show file tree

Hide file tree

Showing 35 changed files with 196 additions and 161 deletions.
diff --git a/pom.xml b/pom.xml
@@ -102,7 +102,7 @@
         <xml.soap-api.version>3.0.0</xml.soap-api.version>
 
         <fastinfoset.version>2.1.0</fastinfoset.version>
-        <mimepull.version>1.9.15</mimepull.version>
+        <mimepull.version>1.10.0</mimepull.version>
         <stax-ex.version>2.1.0</stax-ex.version>
         <junit.version>4.13.2</junit.version>
     </properties>
@@ -146,12 +146,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M5</version>
+                    <version>3.0.0-M6</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.4</version>
+                    <version>5.1.5</version>
                     <configuration>
                         <niceManifest>true</niceManifest>
                         <instructions>
@@ -172,7 +172,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.3.2</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -187,7 +187,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.0.0-M5</version>
+                    <version>3.0.0-M6</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

diff --git a/saaj-ri/pom.xml b/saaj-ri/pom.xml
@@ -219,7 +219,7 @@
                         <plugin>
                             <groupId>org.jacoco</groupId>
                             <artifactId>jacoco-maven-plugin</artifactId>
-                            <version>0.8.7</version>
+                            <version>0.8.8</version>
                         </plugin>
                     </plugins>
                 </pluginManagement>

diff --git a/...-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java b/...-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java
@@ -302,7 +302,7 @@ else if (c == '"') {
 	// Check for SPECIAL or CTL
 	if (c < 040 || c >= 0177 || delimiters.indexOf(c) >= 0) {
 	    currentPos++; // re-position currentPos
-	    char ch[] = new char[1];
+	    char[] ch = new char[1];
 	    ch[0] = c;
 	    return new Token(c, new String(ch));
 	}

diff --git a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/internet/MimeUtility.java b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/internet/MimeUtility.java
@@ -1346,7 +1346,7 @@ static int checkAscii(InputStream is, int max, boolean breakOnNonAscii) {
 	int linelen = 0;
 	boolean longLine = false, badEOL = false;
 	boolean checkEOL = encodeEolStrict && breakOnNonAscii;
-	byte buf[] = null;
+	byte[] buf = null;
 	if (max != 0) {
 	    block = (max == ALL) ? 4096 : Math.min(max, 4096);
 	    buf = new byte[block]; 
@@ -1446,12 +1446,12 @@ public void write(int b) throws IOException {
     }
 
     @Override
-    public void write(byte b[]) throws IOException {
+    public void write(byte[] b) throws IOException {
 	write(b, 0, b.length);
     }
 
     @Override
-    public void write(byte b[], int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
 	len += off;
 	for (int i = off; i < len ; i++)
 	    check(b[i]);

diff --git a/...-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java b/...-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java
@@ -120,7 +120,7 @@ public int available() throws IOException {
      * This character array provides the character to value map
      * based on RFC1521.
      */  
-    private final static char pem_array[] = {
+    private final static char[] pem_array = {
 	'A','B','C','D','E','F','G','H', // 0
 	'I','J','K','L','M','N','O','P', // 1
 	'Q','R','S','T','U','V','W','X', // 2
@@ -131,7 +131,7 @@ public int available() throws IOException {
 	'4','5','6','7','8','9','+','/'  // 7
     };
 
-    private final static byte pem_convert_array[] = new byte[256];
+    private final static byte[] pem_convert_array = new byte[256];
 
     static {
 	for (int i = 0; i < 255; i++)

diff --git a/...-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java b/...-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java
@@ -120,7 +120,7 @@ public void close() throws IOException {
     }
 
     /** This array maps the characters to their 6 bit values */
-    private final static char pem_array[] = {
+    private final static char[] pem_array = {
 	'A','B','C','D','E','F','G','H', // 0
 	'I','J','K','L','M','N','O','P', // 1
 	'Q','R','S','T','U','V','W','X', // 2

diff --git a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/util/OutputUtil.java b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/util/OutputUtil.java
@@ -29,9 +29,11 @@
  *
  * @author Kohsuke Kawaguchi
  */
-public abstract class OutputUtil {
+public final class OutputUtil {
     private static byte[] newline = {'\r','\n'};
 
+    private OutputUtil() {}
+
     public static void writeln(String s,OutputStream out) throws IOException {
         writeAsAscii(s,out);
         writeln(out);

diff --git a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/util/QPEncoderStream.java b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/packaging/mime/util/QPEncoderStream.java
@@ -148,7 +148,7 @@ private void outputCRLF() throws IOException {
     }
 
     // The encoding table
-    private final static char hex[] = {
+    private final static char[] hex = {
 	'0','1', '2', '3', '4', '5', '6', '7',
 	'8','9', 'A', 'B', 'C', 'D', 'E', 'F'
     };

diff --git a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/EnvelopeFactory.java b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/EnvelopeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -41,7 +41,7 @@
  * EnvelopeFactory creates SOAP Envelope objects using different
  * underlying implementations.
  */
-public class EnvelopeFactory {
+public final class EnvelopeFactory {
     private static final String SAX_PARSER_POOL_SIZE_PROP_NAME = "com.sun.xml.messaging.saaj.soap.saxParserPoolSize";
     private static final int DEFAULT_SAX_PARSER_POOL_SIZE = 5;
 
@@ -70,6 +70,8 @@ public Integer run() {
                 }
     };
 
+    private EnvelopeFactory() {}
+
     public static Envelope createEnvelope(Source src, SOAPPartImpl soapPart)
         throws SOAPException 
     {

diff --git a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/FastInfosetDataContentHandler.java b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/FastInfosetDataContentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -37,7 +37,7 @@ public FastInfosetDataContentHandler() {
      */
     @Override
     public ActivationDataFlavor[] getTransferDataFlavors() { // throws Exception;
-        ActivationDataFlavor flavors[] = new ActivationDataFlavor[1];
+        ActivationDataFlavor[] flavors = new ActivationDataFlavor[1];
         flavors[0] = new ActivationDataFlavor(
                 FastInfosetReflection.getFastInfosetSource_class(), 
                 "application/fastinfoset", "Fast Infoset");

diff --git a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/GifDataContentHandler.java b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/GifDataContentHandler.java
@@ -31,6 +31,8 @@ public class GifDataContentHandler extends Component implements DataContentHandl
             "image/gif",
             "GIF Image");
 
+	public GifDataContentHandler() {}
+
     protected ActivationDataFlavor getDF() {
         return myDF;
     }
@@ -69,7 +71,7 @@ public Object getContent(DataSource ds) throws IOException {
 	InputStream is = ds.getInputStream();
 	int pos = 0;
 	int count;
-	byte buf[] = new byte[1024];
+	byte[] buf = new byte[1024];
 
 	while ((count = is.read(buf, pos, buf.length - pos)) != -1) {
 	    pos += count;
@@ -79,7 +81,7 @@ public Object getContent(DataSource ds) throws IOException {
 		    size += size;
 		else
 		    size += 256*1024;
-		byte tbuf[] = new byte[size];
+		byte[] tbuf = new byte[size];
 		System.arraycopy(buf, 0, tbuf, 0, pos);
 		buf = tbuf;
 	    }

diff --git a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/JpegDataContentHandler.java b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/JpegDataContentHandler.java
@@ -33,13 +33,15 @@ public class JpegDataContentHandler
 
     public static final String STR_SRC = "java.awt.Image";
 
+    public JpegDataContentHandler() {}
+
     /**
      * Return the DataFlavors for this <code>DataContentHandler</code>
      * @return The DataFlavors.
      */
     @Override
     public ActivationDataFlavor[] getTransferDataFlavors() { // throws Exception;
-        ActivationDataFlavor flavors[] = new ActivationDataFlavor[1];
+        ActivationDataFlavor[] flavors = new ActivationDataFlavor[1];
 
         try {
             flavors[0] =

diff --git a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/MultipartDataContentHandler.java b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/MultipartDataContentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -22,6 +22,8 @@ public class MultipartDataContentHandler implements DataContentHandler {
 	    "multipart/mixed", 
 	    "Multipart");
 
+    public MultipartDataContentHandler() {}
+
     /**
      * Return the DataFlavors for this <code>DataContentHandler</code>.
      *

diff --git a/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/SOAPFactoryImpl.java b/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/soap/SOAPFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -32,6 +32,8 @@ public abstract class SOAPFactoryImpl extends SOAPFactory {
         log = Logger.getLogger(LogDomainConstants.SOAP_DOMAIN,
                                "com.sun.xml.messaging.saaj.soap.LocalStrings");
 
+    protected SOAPFactoryImpl() {}
+
     protected abstract SOAPDocumentImpl createDocument();
 
     @Override