Run code cleanup in IntelliJ IDEA.

src/main/java/com/ibm/wsdl/extensions/schema/SchemaConstants.java

@@ -40,8 +40,7 @@ public class SchemaConstants {
         new QName(NS_URI_XSD_2000, ELEM_SCHEMA);
     public static final QName Q_ELEM_XSD_2001 =
         new QName(NS_URI_XSD_2001, ELEM_SCHEMA);
-    public static final List XSD_QNAME_LIST = Arrays.asList(new QName[]
-        {Q_ELEM_XSD_1999, Q_ELEM_XSD_2000, Q_ELEM_XSD_2001});
+    public static final List XSD_QNAME_LIST = Arrays.asList(Q_ELEM_XSD_1999, Q_ELEM_XSD_2000, Q_ELEM_XSD_2001);
 
     //Schema import qnames
     public static final QName Q_ELEM_IMPORT_XSD_1999 = new QName(
@@ -50,8 +49,7 @@ public class SchemaConstants {
         NS_URI_XSD_2000, Constants.ELEM_IMPORT);
     public static final QName Q_ELEM_IMPORT_XSD_2001 = new QName(
         NS_URI_XSD_2001, Constants.ELEM_IMPORT);
-    public static final List XSD_IMPORT_QNAME_LIST = Arrays.asList(new QName[] 
-        { Q_ELEM_IMPORT_XSD_1999, Q_ELEM_IMPORT_XSD_2000, Q_ELEM_IMPORT_XSD_2001 });
+    public static final List XSD_IMPORT_QNAME_LIST = Arrays.asList(Q_ELEM_IMPORT_XSD_1999, Q_ELEM_IMPORT_XSD_2000, Q_ELEM_IMPORT_XSD_2001);
 
 
     //Schema include qnames
@@ -61,8 +59,7 @@ public class SchemaConstants {
         NS_URI_XSD_2000, ELEM_INCLUDE);
     public static final QName Q_ELEM_INCLUDE_XSD_2001 = new QName(
         NS_URI_XSD_2001, ELEM_INCLUDE);
-    public static final List XSD_INCLUDE_QNAME_LIST = Arrays.asList(new QName[]
-        { Q_ELEM_INCLUDE_XSD_1999, Q_ELEM_INCLUDE_XSD_2000, Q_ELEM_INCLUDE_XSD_2001 });
+    public static final List XSD_INCLUDE_QNAME_LIST = Arrays.asList(Q_ELEM_INCLUDE_XSD_1999, Q_ELEM_INCLUDE_XSD_2000, Q_ELEM_INCLUDE_XSD_2001);
 
     //Schema redefine qnames
     public static final QName Q_ELEM_REDEFINE_XSD_1999 = new QName(
@@ -71,8 +68,7 @@ public class SchemaConstants {
         NS_URI_XSD_2000, ELEM_REDEFINE);
     public static final QName Q_ELEM_REDEFINE_XSD_2001 = new QName(
 	    NS_URI_XSD_2001, ELEM_REDEFINE);
-    public static final List XSD_REDEFINE_QNAME_LIST = Arrays.asList(new QName[]
-	    { Q_ELEM_REDEFINE_XSD_1999, Q_ELEM_REDEFINE_XSD_2000, Q_ELEM_REDEFINE_XSD_2001 });
+    public static final List XSD_REDEFINE_QNAME_LIST = Arrays.asList(Q_ELEM_REDEFINE_XSD_1999, Q_ELEM_REDEFINE_XSD_2000, Q_ELEM_REDEFINE_XSD_2001);
 
 
 }

src/main/java/com/ibm/wsdl/xml/WSDLReaderImpl.java

@@ -38,13 +38,13 @@ public class WSDLReaderImpl implements WSDLReader
 {
   // Used for determining the style of operations.
   private static final List STYLE_ONE_WAY =
-    Arrays.asList(new String[]{Constants.ELEM_INPUT});
+    Arrays.asList(Constants.ELEM_INPUT);
   private static final List STYLE_REQUEST_RESPONSE =
-    Arrays.asList(new String[]{Constants.ELEM_INPUT, Constants.ELEM_OUTPUT});
+    Arrays.asList(Constants.ELEM_INPUT, Constants.ELEM_OUTPUT);
   private static final List STYLE_SOLICIT_RESPONSE =
-    Arrays.asList(new String[]{Constants.ELEM_OUTPUT, Constants.ELEM_INPUT});
+    Arrays.asList(Constants.ELEM_OUTPUT, Constants.ELEM_INPUT);
   private static final List STYLE_NOTIFICATION =
-    Arrays.asList(new String[]{Constants.ELEM_OUTPUT});
+    Arrays.asList(Constants.ELEM_OUTPUT);
 
   protected boolean verbose = true;
   protected boolean importDocuments = true;

src/main/java/com/ibm/wsdl/xml/WSDLWriterImpl.java

@@ -5,6 +5,7 @@
 package com.ibm.wsdl.xml;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import javax.xml.namespace.*;
 import javax.xml.parsers.*;
@@ -1084,16 +1085,7 @@ public void writeWSDL(Definition wsdlDef, OutputStream sink)
   {
     Writer writer = null;
 
-    try
-    {
-      writer = new OutputStreamWriter(sink, "UTF8");
-    }
-    catch (UnsupportedEncodingException e)
-    {
-      e.printStackTrace();
-
-      writer = new OutputStreamWriter(sink);
-    }
+    writer = new OutputStreamWriter(sink, StandardCharsets.UTF_8);
 
     writeWSDL(wsdlDef, writer);
   }

src/main/java/javax/wsdl/Binding.java

@@ -22,35 +22,35 @@ public interface Binding extends WSDLElement
    *
    * @param name the desired name
    */
-  public void setQName(QName name);
+  void setQName(QName name);
 
   /**
    * Get the name of this binding.
    *
    * @return the binding name
    */
-  public QName getQName();
+  QName getQName();
 
   /**
    * Set the port type this is a binding for.
    *
    * @param portType the port type associated with this binding
    */
-  public void setPortType(PortType portType);
+  void setPortType(PortType portType);
 
   /**
    * Get the port type this is a binding for.
    *
    * @return the associated port type
    */
-  public PortType getPortType();
+  PortType getPortType();
 
   /**
    * Add an operation binding to binding.
    *
    * @param bindingOperation the operation binding to be added
    */
-  public void addBindingOperation(BindingOperation bindingOperation);
+  void addBindingOperation(BindingOperation bindingOperation);
 
   /**
    * Get the specified operation binding. Note that operation names can
@@ -85,14 +85,14 @@ public interface Binding extends WSDLElement
    * 
    * @throws IllegalArgumentException if duplicate operations are found.
    */
-  public BindingOperation getBindingOperation(String name,
-                                              String inputName,
-                                              String outputName);
+  BindingOperation getBindingOperation(String name,
+                                       String inputName,
+                                       String outputName);
 
   /**
    * Get all the operation bindings defined here.
    */
-  public List getBindingOperations();
+  List getBindingOperations();
 
   /**
    * Remove the specified operation binding. Note that operation names can
@@ -117,11 +117,11 @@ public BindingOperation getBindingOperation(String name,
    * 
    * @see #getBindingOperation(String, String, String) 
    */
-  public BindingOperation removeBindingOperation(String name,
-                                                 String inputName,
-                                                 String outputName);
+  BindingOperation removeBindingOperation(String name,
+                                          String inputName,
+                                          String outputName);
 
-  public void setUndefined(boolean isUndefined);
+  void setUndefined(boolean isUndefined);
 
-  public boolean isUndefined();
+  boolean isUndefined();
 }

src/main/java/javax/wsdl/BindingFault.java

@@ -19,13 +19,13 @@ public interface BindingFault extends WSDLElement
    *
    * @param name the desired name
    */
-  public void setName(String name);
+  void setName(String name);
 
   /**
    * Get the name of this fault binding.
    *
    * @return the fault binding name
    */
-  public String getName();
+  String getName();
 
 }

src/main/java/javax/wsdl/BindingInput.java

@@ -19,13 +19,13 @@ public interface BindingInput extends WSDLElement
    *
    * @param name the desired name
    */
-  public void setName(String name);
+  void setName(String name);
 
   /**
    * Get the name of this input binding.
    *
    * @return the input binding name
    */
-  public String getName();
+  String getName();
 
 }

src/main/java/javax/wsdl/BindingOperation.java

@@ -21,71 +21,71 @@ public interface BindingOperation extends WSDLElement
    *
    * @param name the desired name
    */
-  public void setName(String name);
+  void setName(String name);
 
   /**
    * Get the name of this operation binding.
    *
    * @return the operation binding name
    */
-  public String getName();
+  String getName();
 
   /**
    * Set the operation that this operation binding binds.
    *
    * @param operation the operation this operation binding binds
    */
-  public void setOperation(Operation operation);
+  void setOperation(Operation operation);
 
   /**
    * Get the operation that this operation binding binds.
    *
    * @return the operation that this operation binding binds
    */
-  public Operation getOperation();
+  Operation getOperation();
 
   /**
    * Set the input binding for this operation binding.
    *
    * @param bindingInput the new input binding
    */
-  public void setBindingInput(BindingInput bindingInput);
+  void setBindingInput(BindingInput bindingInput);
 
   /**
    * Get the input binding for this operation binding.
    *
    * @return the input binding
    */
-  public BindingInput getBindingInput();
+  BindingInput getBindingInput();
 
   /**
    * Set the output binding for this operation binding.
    *
    * @param bindingOutput the new output binding
    */
-  public void setBindingOutput(BindingOutput bindingOutput);
+  void setBindingOutput(BindingOutput bindingOutput);
 
   /**
    * Get the output binding for this operation binding.
    *
    * @return the output binding for the operation binding
    */
-  public BindingOutput getBindingOutput();
+  BindingOutput getBindingOutput();
 
   /**
    * Add a fault binding.
    *
    * @param bindingFault the new fault binding
    */
-  public void addBindingFault(BindingFault bindingFault);
+  void addBindingFault(BindingFault bindingFault);
 
   /**
    * Remove a fault binding.
    *
    * @param name the name of the fault binding to be removed
    * @return the BindingFault which was removed
    */
-  public BindingFault removeBindingFault(String name);
+  BindingFault removeBindingFault(String name);
 
   /**
    * Get the specified fault binding.
@@ -94,13 +94,13 @@ public interface BindingOperation extends WSDLElement
    * @return the corresponding fault binding, or null if there wasn't
    * any matching fault binding
    */
-  public BindingFault getBindingFault(String name);
+  BindingFault getBindingFault(String name);
 
   /**
    * Get all the fault bindings associated with this operation binding.
    *
    * @return names of fault bindings
    */
-  public Map getBindingFaults();
+  Map getBindingFaults();
 
 }

src/main/java/javax/wsdl/BindingOutput.java

@@ -19,13 +19,13 @@ public interface BindingOutput extends WSDLElement
    *
    * @param name the desired name
    */
-  public void setName(String name);
+  void setName(String name);
 
   /**
    * Get the name of this output binding.
    *
    * @return the output binding name
    */
-  public String getName();
+  String getName();
 
 }