Code clean up (#48)

Author: dwalluck

rwx-test/src/main/java/org/commonjava/rwx/test/jira/JiraServerInfo.java

@@ -20,11 +20,16 @@
  */
 public final class JiraServerInfo extends AbstractJiraServerInfo
 {
-    private String version;
-    private String baseUrl;
-    private String buildDate;
-    private int buildNumber;
+    private final String version;
+
+    private final String baseUrl;
+
+    private final String buildDate;
+
+    private final int buildNumber;
+
     private String edition;
+
     private String serverTime;
 
     public JiraServerInfo( String version, String baseUrl, String buildDate, int buildNumber )

rwx-test/src/main/java/org/commonjava/rwx/test/jira/JiraServerInfoConverter.java

@@ -29,17 +29,17 @@ public class JiraServerInfoConverter implements Converter<AbstractJiraServerInfo
     @Override
     public AbstractJiraServerInfo parse( Object object )
     {
-        Map<String, Object> map = (Map) object;
+        Map<String, Object> map = (Map<String, Object>) object;
         String version = (String) map.get( "version" );
         String baseUrl = (String) map.get( "baseUrl" );
         String buildDate = (String) map.get( "buildDate" );
         String edition = (String) map.get( "edition" );
         String serverTime = (String) map.get( "serverTime" );
         int buildNumber = (Integer) map.get( "buildNumber" );
 
-        JiraServerInfo ret = new JiraServerInfo(version, baseUrl, buildDate, buildNumber);
-        ret.setEdition(edition);
-        ret.setServerTime(serverTime);
+        JiraServerInfo ret = new JiraServerInfo( version, baseUrl, buildDate, buildNumber );
+        ret.setEdition( edition );
+        ret.setServerTime( serverTime );
         return ret;
     }
 

rwx-test/src/main/java/org/commonjava/rwx/test/koji/GetBuildResponse.java

@@ -24,7 +24,7 @@
 @Response
 public class GetBuildResponse
 {
-    @DataIndex(0)
+    @DataIndex( 0 )
     private KojiBuildInfo buildInfo;
 
     public KojiBuildInfo getBuildInfo()

rwx-test/src/main/java/org/commonjava/rwx/test/koji/KojiBuildInfo.java

@@ -100,7 +100,7 @@ public class KojiBuildInfo
 
     public KojiBuildInfo() {}
 
-    public KojiBuildInfo(int id, int packageId, String name, String version, String release)
+    public KojiBuildInfo( int id, int packageId, String name, String version, String release )
     {
         setId( id );
         setPackageId( packageId );

rwx-test/src/main/java/org/commonjava/rwx/test/koji/KojiTagInfo.java

@@ -52,7 +52,7 @@ public class KojiTagInfo
 
     public KojiTagInfo(){}
 
-    public KojiTagInfo( String name)
+    public KojiTagInfo( String name )
     {
         this.name = name;
     }
@@ -84,7 +84,7 @@ public List<String> getArches()
 
     public boolean isLocked()
     {
-        return locked;
+        return locked != null && locked;
     }
 
     public boolean getMavenSupport()

rwx-test/src/main/java/org/commonjava/rwx/test/simple/SimpleResponse.java

@@ -34,7 +34,7 @@ public void setValue( double value )
         this.value = value;
     }
 
-    @DataIndex(0)
+    @DataIndex( 0 )
     private double value;
 
 }

rwx-test/src/main/java/org/commonjava/rwx/test/subclass/Constants.java

@@ -20,6 +20,11 @@
  */
 public class Constants
 {
+    private Constants()
+    {
+        throw new UnsupportedOperationException( "This is a utility class and cannot be instantiated" );
+    }
+
     public static final String NAME = "name";
 
     public static final String VERSION = "version";

rwx-test/src/main/java/org/commonjava/rwx/test/subclass/GetBuildDescriptionResponse.java

@@ -24,7 +24,7 @@
 @Response
 public class GetBuildDescriptionResponse
 {
-    @DataIndex(0)
+    @DataIndex( 0 )
     private BuildDescription value;
 
     public BuildDescription getValue()

rwx-test/src/test/java/org/commonjava/rwx/test/AbstractTest.java

@@ -20,7 +20,6 @@
 import org.commonjava.rwx.test.generated.Test_Registry;
 import org.junit.BeforeClass;
 
-import javax.xml.stream.XMLStreamException;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,25 +40,25 @@ public static void register()
         Registry.setInstance( new Test_Registry() );
     }
 
-    protected InputStream getXMLStream( final String name ) throws IOException, XMLStreamException
+    protected InputStream getXMLStream( final String name )
     {
         return Thread.currentThread().getContextClassLoader().getResourceAsStream( DOC_PATH + name + ".xml" );
     }
 
-    protected String getXMLString( final String name ) throws IOException, XMLStreamException
+    protected String getXMLString( final String name ) throws IOException
     {
         return IOUtils.toString( new InputStreamReader( getXMLStream( name ) ));
     }
 
     // Comparing XML string is a bad idea. But we need it in some cases, e.g., kojiListBuildsResponseNIL
 
-    protected String getXMLStringIgnoreFormat( final String name ) throws IOException, XMLStreamException
+    protected String getXMLStringIgnoreFormat( final String name ) throws IOException
     {
         final BufferedReader reader = new BufferedReader( new InputStreamReader( getXMLStream( name ) ) );
         final StringWriter writer = new StringWriter();
         final PrintWriter pWriter = new PrintWriter( writer );
 
-        String line = null;
+        String line;
         while ( ( line = reader.readLine() ) != null )
         {
             pWriter.print( line.trim() );

rwx-test/src/test/java/org/commonjava/rwx/test/jira/JiraServerInfoArrayConverterTest.java

@@ -20,7 +20,6 @@
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
-import java.util.List;
 
 import static junit.framework.TestCase.assertEquals;