Code clean up

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/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/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/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;
 

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

@@ -16,10 +16,7 @@
 package org.commonjava.rwx.test.jira;
 
 import org.commonjava.rwx.api.RWXMapper;
-import org.commonjava.rwx.core.Registry;
 import org.commonjava.rwx.test.AbstractTest;
-import org.commonjava.rwx.test.generated.Test_Registry;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;

rwx-test/src/test/java/org/commonjava/rwx/test/koji/KojiMultiCallTest.java

@@ -17,7 +17,6 @@
 
 import org.commonjava.rwx.api.RWXMapper;
 import org.commonjava.rwx.core.Registry;
-import org.commonjava.rwx.error.XmlRpcException;
 import org.commonjava.rwx.test.AbstractTest;
 import org.junit.Test;
 
@@ -51,7 +50,7 @@ public void multiCallRequest_renderTest_0() throws Exception
 
         Object renderedKojiNVR = Registry.getInstance().renderTo( kojiNVR );
 
-        List params = new ArrayList<>(  );
+        List<Object> params = new ArrayList<>(  );
         params.add( renderedKojiNVR );
         multiCallObj.setParams( params );
 
@@ -69,7 +68,7 @@ public void multiCallRequest_renderTest() throws Exception
         List<MultiCallObj> multiObjs = new ArrayList<>(  );
 
         MultiCallObj callObj_1 = new MultiCallObj( "getBuild" );
-        List params = new ArrayList<>(  );
+        List<Object> params = new ArrayList<>(  );
         params.add( "org.dashbuilder-dashbuilder-parent-metadata-0.4.0.Final-1" );
         callObj_1.setParams( params );
         multiObjs.add( callObj_1 );
@@ -143,7 +142,7 @@ public void roundTrip_MultiCallResponse() throws Exception
         assertMultiCallResponse( rounded );
     }
 
-    private void assertMultiCallResponse( MultiCallResponse response ) throws XmlRpcException
+    private void assertMultiCallResponse( MultiCallResponse response )
     {
         List<MultiCallValueObj> valueObjs = response.getValueObjs();
 
@@ -167,15 +166,15 @@ private void assertMultiCallResponse( MultiCallResponse response ) throws XmlRpc
         assertEquals( "org.dashbuilder-dashbuilder-parent-metadata", kojiBuildInfo.getPackageName() );
 
         // if we do not know the type, access Map directly
-        Map<String, Object> data1Map = (Map) data1;
+        Map<String, Object> data1Map = (Map<String, Object>) data1;
         assertEquals( 48475, data1Map.get( "package_id" ) );
         assertEquals( 513598, data1Map.get( "build_id" ) );
         assertEquals( "org.dashbuilder-dashbuilder-parent-metadata", data1Map.get( "package_name" ) );
 
 
         // b. verify response from listTags call
 
-        List<Object> data2List = (List) data2;
+        List<Object> data2List = (List<Object>) data2;
         assertEquals( 4, data2List.size() );
 
         // if we know the type (KojiTagInfo) in the list, parse the element to it
@@ -186,7 +185,7 @@ private void assertMultiCallResponse( MultiCallResponse response ) throws XmlRpc
         // if we do not know the type, access List directly
         Object data2_1 = data2List.get( 0 );
         assertTrue( data2_1 instanceof Map );
-        Map<String, Object> data2_1Map = (Map) data2_1;
+        Map<String, Object> data2_1Map = (Map<String, Object>) data2_1;
         assertEquals( "jb-bxms-6.3-candidate", data2_1Map.get( "name" ) );
         assertEquals( 8829, data2_1Map.get( "id" ) );
     }

rwx-test/src/test/java/org/commonjava/rwx/test/koji/KojiRWXMapperTest.java

@@ -17,13 +17,14 @@
 
 import org.commonjava.rwx.api.RWXMapper;
 import org.commonjava.rwx.test.AbstractTest;
-import org.commonjava.rwx.test.simple.RequestWithOneParam;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
 import java.util.List;
 
 import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertTrue;
 
 /**
  * Created by ruhan on 8/2/17.
@@ -113,7 +114,7 @@ private void assertGetBuildResponse( GetBuildResponse response )
         assertEquals( "org.dashbuilder-dashbuilder-parent-metadata", buildInfo.getName() );
         assertEquals( "1", buildInfo.getRelease() );
         assertEquals( "0.4.0.Final_10", buildInfo.getVersion() );
-        assertEquals( null, buildInfo.getExtra() );
+        assertNull( buildInfo.getExtra() );
     }
 
     @Test
@@ -123,7 +124,7 @@ public void roundTrip_ListBuildResponseNIL() throws Exception
         ListBuildResponse parsed =
                         new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), ListBuildResponse.class );
 
-        assertEquals( null, parsed.getBuilds() );
+        assertNull( parsed.getBuilds() );
 
         String rendered = new RWXMapper().render( parsed );
 
@@ -155,11 +156,11 @@ private void assertListTagsResponse( ListTagsResponse response )
         for ( KojiTagInfo tag : tags )
         {
             assertEquals( Boolean.FALSE, tag.getLocked() );
-            assertEquals( true, tag.getMavenSupport() );
-            assertEquals( true, tag.getMavenIncludeAll() );
-            assertEquals( null, tag.getPermission() );
-            assertEquals( null, tag.getPermissionId() );
-            assertEquals( null, tag.getArches() );
+            assertTrue( tag.getMavenSupport() );
+            assertTrue( tag.getMavenIncludeAll() );
+            assertNull( tag.getPermission() );
+            assertNull( tag.getPermissionId() );
+            assertNull( tag.getArches() );
         }
 
         KojiTagInfo tag0 = tags.get( 0 );