diff --git a/rwx-test/src/main/java/org/commonjava/rwx/test/jira/JiraServerInfo.java b/rwx-test/src/main/java/org/commonjava/rwx/test/jira/JiraServerInfo.java index 2edb59c..58ca7ec 100644 --- a/rwx-test/src/main/java/org/commonjava/rwx/test/jira/JiraServerInfo.java +++ b/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 ) diff --git a/rwx-test/src/main/java/org/commonjava/rwx/test/jira/JiraServerInfoConverter.java b/rwx-test/src/main/java/org/commonjava/rwx/test/jira/JiraServerInfoConverter.java index e41bb79..ecdab74 100644 --- a/rwx-test/src/main/java/org/commonjava/rwx/test/jira/JiraServerInfoConverter.java +++ b/rwx-test/src/main/java/org/commonjava/rwx/test/jira/JiraServerInfoConverter.java @@ -29,7 +29,7 @@ public class JiraServerInfoConverter implements Converter map = (Map) object; + Map map = (Map) object; String version = (String) map.get( "version" ); String baseUrl = (String) map.get( "baseUrl" ); String buildDate = (String) map.get( "buildDate" ); @@ -37,9 +37,9 @@ public AbstractJiraServerInfo parse( Object object ) 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; } diff --git a/rwx-test/src/main/java/org/commonjava/rwx/test/koji/GetBuildResponse.java b/rwx-test/src/main/java/org/commonjava/rwx/test/koji/GetBuildResponse.java index 21d4735..2e28158 100644 --- a/rwx-test/src/main/java/org/commonjava/rwx/test/koji/GetBuildResponse.java +++ b/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() diff --git a/rwx-test/src/main/java/org/commonjava/rwx/test/koji/KojiBuildInfo.java b/rwx-test/src/main/java/org/commonjava/rwx/test/koji/KojiBuildInfo.java index b3dba2e..1db3b35 100644 --- a/rwx-test/src/main/java/org/commonjava/rwx/test/koji/KojiBuildInfo.java +++ b/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 ); diff --git a/rwx-test/src/main/java/org/commonjava/rwx/test/koji/KojiTagInfo.java b/rwx-test/src/main/java/org/commonjava/rwx/test/koji/KojiTagInfo.java index f92c6e1..e1f8be9 100644 --- a/rwx-test/src/main/java/org/commonjava/rwx/test/koji/KojiTagInfo.java +++ b/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 getArches() public boolean isLocked() { - return locked; + return locked != null && locked; } public boolean getMavenSupport() diff --git a/rwx-test/src/main/java/org/commonjava/rwx/test/simple/SimpleResponse.java b/rwx-test/src/main/java/org/commonjava/rwx/test/simple/SimpleResponse.java index db3635e..a3161da 100644 --- a/rwx-test/src/main/java/org/commonjava/rwx/test/simple/SimpleResponse.java +++ b/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; } diff --git a/rwx-test/src/main/java/org/commonjava/rwx/test/subclass/Constants.java b/rwx-test/src/main/java/org/commonjava/rwx/test/subclass/Constants.java index 9c0fa18..6221fad 100644 --- a/rwx-test/src/main/java/org/commonjava/rwx/test/subclass/Constants.java +++ b/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"; diff --git a/rwx-test/src/main/java/org/commonjava/rwx/test/subclass/GetBuildDescriptionResponse.java b/rwx-test/src/main/java/org/commonjava/rwx/test/subclass/GetBuildDescriptionResponse.java index 5e2a927..815c393 100644 --- a/rwx-test/src/main/java/org/commonjava/rwx/test/subclass/GetBuildDescriptionResponse.java +++ b/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() diff --git a/rwx-test/src/test/java/org/commonjava/rwx/test/AbstractTest.java b/rwx-test/src/test/java/org/commonjava/rwx/test/AbstractTest.java index f2ca6ac..f081ea8 100644 --- a/rwx-test/src/test/java/org/commonjava/rwx/test/AbstractTest.java +++ b/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() ); diff --git a/rwx-test/src/test/java/org/commonjava/rwx/test/jira/JiraServerInfoArrayConverterTest.java b/rwx-test/src/test/java/org/commonjava/rwx/test/jira/JiraServerInfoArrayConverterTest.java index 2570a54..3c77020 100644 --- a/rwx-test/src/test/java/org/commonjava/rwx/test/jira/JiraServerInfoArrayConverterTest.java +++ b/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; diff --git a/rwx-test/src/test/java/org/commonjava/rwx/test/jira/JiraServerInfoConverterTest.java b/rwx-test/src/test/java/org/commonjava/rwx/test/jira/JiraServerInfoConverterTest.java index b5f6cbe..9c31675 100644 --- a/rwx-test/src/test/java/org/commonjava/rwx/test/jira/JiraServerInfoConverterTest.java +++ b/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; diff --git a/rwx-test/src/test/java/org/commonjava/rwx/test/koji/KojiMultiCallTest.java b/rwx-test/src/test/java/org/commonjava/rwx/test/koji/KojiMultiCallTest.java index 6413eec..5821882 100644 --- a/rwx-test/src/test/java/org/commonjava/rwx/test/koji/KojiMultiCallTest.java +++ b/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 params = new ArrayList<>( ); params.add( renderedKojiNVR ); multiCallObj.setParams( params ); @@ -69,7 +68,7 @@ public void multiCallRequest_renderTest() throws Exception List multiObjs = new ArrayList<>( ); MultiCallObj callObj_1 = new MultiCallObj( "getBuild" ); - List params = new ArrayList<>( ); + List 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 valueObjs = response.getValueObjs(); @@ -167,7 +166,7 @@ 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 data1Map = (Map) data1; + Map data1Map = (Map) data1; assertEquals( 48475, data1Map.get( "package_id" ) ); assertEquals( 513598, data1Map.get( "build_id" ) ); assertEquals( "org.dashbuilder-dashbuilder-parent-metadata", data1Map.get( "package_name" ) ); @@ -175,7 +174,7 @@ private void assertMultiCallResponse( MultiCallResponse response ) throws XmlRpc // b. verify response from listTags call - List data2List = (List) data2; + List data2List = (List) 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 data2_1Map = (Map) data2_1; + Map data2_1Map = (Map) data2_1; assertEquals( "jb-bxms-6.3-candidate", data2_1Map.get( "name" ) ); assertEquals( 8829, data2_1Map.get( "id" ) ); } diff --git a/rwx-test/src/test/java/org/commonjava/rwx/test/koji/KojiRWXMapperTest.java b/rwx-test/src/test/java/org/commonjava/rwx/test/koji/KojiRWXMapperTest.java index 528da1a..b7253e7 100644 --- a/rwx-test/src/test/java/org/commonjava/rwx/test/koji/KojiRWXMapperTest.java +++ b/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 ); diff --git a/rwx-test/src/test/java/org/commonjava/rwx/test/simple/SimpleRWXMapperTest.java b/rwx-test/src/test/java/org/commonjava/rwx/test/simple/SimpleRWXMapperTest.java index 63f56f3..b0cb06c 100644 --- a/rwx-test/src/test/java/org/commonjava/rwx/test/simple/SimpleRWXMapperTest.java +++ b/rwx-test/src/test/java/org/commonjava/rwx/test/simple/SimpleRWXMapperTest.java @@ -16,9 +16,7 @@ package org.commonjava.rwx.test.simple; import org.commonjava.rwx.api.RWXMapper; -import org.commonjava.rwx.core.Registry; import org.commonjava.rwx.test.AbstractTest; -import org.junit.BeforeClass; import org.junit.Test; import java.io.ByteArrayInputStream; @@ -56,7 +54,7 @@ public void requestWithOneParamTest() throws Exception public void roundTrip_RequestWithOneArrayParamTest() throws Exception { RequestWithOneArrayParam requst = new RequestWithOneArrayParam(); - List array = Arrays.asList( new String[] { "test1", "test2" } ); + List array = Arrays.asList( "test1", "test2" ); requst.setArray( array ); String request = new RWXMapper().render( requst ); String expected = getXMLStringIgnoreFormat( "requestWithOneArrayParam" ); @@ -75,5 +73,4 @@ public void simpleResponseTest() throws Exception SimpleResponse response = new RWXMapper().parse( stream, SimpleResponse.class ); assertEquals( 18.24668429131D, response.getValue() ); } - } diff --git a/rwx-test/src/test/java/org/commonjava/rwx/test/subclass/SubclassMapperTest.java b/rwx-test/src/test/java/org/commonjava/rwx/test/subclass/SubclassMapperTest.java index 87723b6..642d408 100644 --- a/rwx-test/src/test/java/org/commonjava/rwx/test/subclass/SubclassMapperTest.java +++ b/rwx-test/src/test/java/org/commonjava/rwx/test/subclass/SubclassMapperTest.java @@ -22,6 +22,7 @@ import java.io.InputStream; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * Created by ruhan on 12/19/17. @@ -33,6 +34,7 @@ public class SubclassMapperTest public void renderer() throws Exception { String result = new RWXMapper().render( getInstance() ); + assertNotNull( result ); } @Test @@ -73,6 +75,4 @@ private GetBuildDescriptionResponse getInstance() response.setValue( value ); return response; } - } - diff --git a/rwx/src/main/java/org/commonjava/rwx/api/RWXMapper.java b/rwx/src/main/java/org/commonjava/rwx/api/RWXMapper.java index 23b2aa7..dc1aeb6 100644 --- a/rwx/src/main/java/org/commonjava/rwx/api/RWXMapper.java +++ b/rwx/src/main/java/org/commonjava/rwx/api/RWXMapper.java @@ -17,9 +17,7 @@ import org.commonjava.rwx.error.XmlRpcException; import org.commonjava.rwx.error.XmlRpcFaultException; -import org.commonjava.rwx.core.Parser; import org.commonjava.rwx.core.Registry; -import org.commonjava.rwx.core.Renderer; import org.commonjava.rwx.core.XmlRpcParser; import org.commonjava.rwx.model.Fault; import org.commonjava.rwx.model.RpcObject; @@ -37,9 +35,9 @@ public final class RWXMapper /** * Render an object to XML-RPC request or response string. * - * @param obj - * @return - * @throws XmlRpcException + * @param obj the object to be rendered + * @return the XML string + * @throws XmlRpcException if the object cannot be rendered */ public String render( Object obj ) throws XmlRpcException { @@ -48,18 +46,18 @@ public String render( Object obj ) throws XmlRpcException } /** - * Parse a XML-RPC request or response stream (XML string) to an object. + * Parse ab XML-RPC request or response stream (XML string) to an object. * - * @param stream - * @param type - * @param - * @return - * @throws XmlRpcException + * @param stream the input stream consisting of XML-RPC request or response + * @param type the class of the object to be parsed + * @param the type of the object to be parsed + * @return the object parsed from the XML-RPC stream + * @throws XmlRpcException if the stream cannot be parsed */ public T parse( InputStream stream, Class type ) throws XmlRpcException { final XmlRpcParser xmlRpcParser = new XmlRpcParser( stream ); - RpcObject rpcObject = null; + RpcObject rpcObject; try { rpcObject = xmlRpcParser.parse(); diff --git a/rwx/src/main/java/org/commonjava/rwx/core/AnnoProcessor.java b/rwx/src/main/java/org/commonjava/rwx/core/AnnoProcessor.java index a6cc146..8bf3403 100644 --- a/rwx/src/main/java/org/commonjava/rwx/core/AnnoProcessor.java +++ b/rwx/src/main/java/org/commonjava/rwx/core/AnnoProcessor.java @@ -19,8 +19,13 @@ import groovy.text.GStringTemplateEngine; import groovy.text.Template; import org.apache.commons.io.IOUtils; -import org.commonjava.rwx.anno.*; +import org.commonjava.rwx.anno.ArrayPart; import org.commonjava.rwx.anno.Converter; +import org.commonjava.rwx.anno.DataIndex; +import org.commonjava.rwx.anno.DataKey; +import org.commonjava.rwx.anno.Request; +import org.commonjava.rwx.anno.Response; +import org.commonjava.rwx.anno.StructPart; import org.commonjava.rwx.util.ProcessorUtils; import javax.annotation.processing.AbstractProcessor; @@ -40,7 +45,6 @@ import java.io.IOException; import java.io.Writer; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -343,7 +347,7 @@ private Item getItemObj( Element e, String method, Function func Converter converter = getConverter( e ); - if (converter != null) + if ( converter != null ) { item.setConverter( getConverterQName( converter ) ); } diff --git a/rwx/src/main/java/org/commonjava/rwx/core/Registry.java b/rwx/src/main/java/org/commonjava/rwx/core/Registry.java index e5be872..24ba7f6 100644 --- a/rwx/src/main/java/org/commonjava/rwx/core/Registry.java +++ b/rwx/src/main/java/org/commonjava/rwx/core/Registry.java @@ -23,25 +23,26 @@ */ public class Registry { - protected Map parserMap = new ConcurrentHashMap<>(); - protected Map rendererMap = new ConcurrentHashMap<>(); + protected Map, Parser> parserMap = new ConcurrentHashMap<>(); - protected void setParser(Class cls, Parser parser) + protected Map, Renderer> rendererMap = new ConcurrentHashMap<>(); + + protected void setParser( Class cls, Parser parser ) { parserMap.put( cls, parser ); } - protected void setRenderer(Class cls, Renderer renderer) + protected void setRenderer( Class cls, Renderer renderer ) { rendererMap.put( cls, renderer ); } public T parseAs( Object o, Class type ) { - Parser parser = parserMap.get( type ); + Parser parser = parserMap.get( type ); if ( parser == null ) { - throw new RuntimeException( "Parser not found for " + type.getName() ); + throw new IllegalArgumentException( "Parser not found for " + type.getName() ); } return type.cast( parser.parse( o ) ); } @@ -51,17 +52,17 @@ public Object renderTo( Object obj ) Renderer renderer = rendererMap.get( obj.getClass() ); if ( renderer == null ) { - throw new RuntimeException( "Renderer not found for " + obj.getClass() ); + throw new IllegalArgumentException( "Renderer not found for " + obj.getClass() ); } return renderer.render( obj ); } - public boolean hasRenderer( Class type ) + public boolean hasRenderer( Class type ) { return rendererMap.get( type ) != null; } - public boolean hasParser( Class type ) + public boolean hasParser( Class type ) { return parserMap.get( type ) != null; } @@ -70,11 +71,13 @@ public boolean hasParser( Class type ) private static Registry instance = new Registry(); // default - public static synchronized Registry getInstance() { + public static synchronized Registry getInstance() + { return instance; } - public static synchronized void setInstance( Registry registry ) { + public static synchronized void setInstance( Registry registry ) + { instance = registry; } } diff --git a/rwx/src/main/java/org/commonjava/rwx/error/XmlRpcException.java b/rwx/src/main/java/org/commonjava/rwx/error/XmlRpcException.java index 6d3d986..f81bb68 100644 --- a/rwx/src/main/java/org/commonjava/rwx/error/XmlRpcException.java +++ b/rwx/src/main/java/org/commonjava/rwx/error/XmlRpcException.java @@ -50,7 +50,7 @@ public String getMessage() { try { - formatted = String.format( formatted.replaceAll( "\\{\\}", "%s" ), params ); + formatted = String.format( formatted.replace( "{}", "%s" ), params ); } catch ( final IllegalFormatException ife ) { diff --git a/rwx/src/main/java/org/commonjava/rwx/model/Fault.java b/rwx/src/main/java/org/commonjava/rwx/model/Fault.java index 52c2983..d5e68b0 100644 --- a/rwx/src/main/java/org/commonjava/rwx/model/Fault.java +++ b/rwx/src/main/java/org/commonjava/rwx/model/Fault.java @@ -16,10 +16,11 @@ package org.commonjava.rwx.model; /** - * XML-RPC faults are a type of responses. If there was a problem in processing a XML-RPC request, the methodResponse + * XML-RPC faults are a type of responses. + * If there was a problem in processing an XML-RPC request, the methodResponse * element will contain a fault element instead of a params element. The fault element, like the params element, has * only a single value that indicates something went wrong. - * + *

* Created by ruhan on 7/13/17. */ public final class Fault extends RpcObject diff --git a/rwx/src/main/java/org/commonjava/rwx/model/MethodCall.java b/rwx/src/main/java/org/commonjava/rwx/model/MethodCall.java index d405ca9..ba3ef89 100644 --- a/rwx/src/main/java/org/commonjava/rwx/model/MethodCall.java +++ b/rwx/src/main/java/org/commonjava/rwx/model/MethodCall.java @@ -19,7 +19,7 @@ * Each request contains a single XML document, whose root element is a methodCall element. * Each methodCall element contains a methodName element and a params element. The methodName element identifies * the name of the procedure to be called, while the params element contains a list of parameters and their values. - * + *

* Created by ruhan on 7/13/17. */ public final class MethodCall diff --git a/rwx/src/main/java/org/commonjava/rwx/model/MethodResponse.java b/rwx/src/main/java/org/commonjava/rwx/model/MethodResponse.java index 8bc012f..bc2a767 100644 --- a/rwx/src/main/java/org/commonjava/rwx/model/MethodResponse.java +++ b/rwx/src/main/java/org/commonjava/rwx/model/MethodResponse.java @@ -19,13 +19,14 @@ * Responses are much like requests. If the response is successful - the procedure was found, * executed correctly, and returned results - then the XML-RPC response will look much like a request, * except that the methodCall element is replaced by a methodResponse and there is no methodName. - * + *

* Responses follow some additional constraints: - * - * 1. An XML-RPC response can only contain one parameter. - * 2. That parameter may be an array or a struct, so it is possible to return multiple values. - * 3. It is always required to return a value in response. A "success value" - perhaps a Boolean set to true (1). - * + *

    + *
  1. An XML-RPC response can only contain one parameter.
    2. + *
  2. That parameter may be an array or a struct, so it is possible to return multiple values.
    3. + *
  3. It is always required to return a value in response. A "success value" - perhaps a Boolean set to true (1).
    4. + *
+ *

* Created by ruhan on 7/13/17. */ public final class MethodResponse diff --git a/rwx/src/main/java/org/commonjava/rwx/util/ParseUtils.java b/rwx/src/main/java/org/commonjava/rwx/util/ParseUtils.java index e187de5..b756fe1 100644 --- a/rwx/src/main/java/org/commonjava/rwx/util/ParseUtils.java +++ b/rwx/src/main/java/org/commonjava/rwx/util/ParseUtils.java @@ -26,6 +26,11 @@ */ public class ParseUtils { + private ParseUtils() + { + throw new UnsupportedOperationException( "This is a utility class and cannot be instantiated" ); + } + public static Object nullifyNil( Object object ) { if ( isNil( object ) ) @@ -44,11 +49,11 @@ public static boolean isNil( Object object ) * Upgrade cast, e.g., Int to Long. * * @param clazz target type - * @param value object to be casted - * @return object of target type + * @param value object to be cast + * @return object of the target type * @throws ClassCastException If not castable, throw ClassCastException */ - public static Object upgradeCast( Class clazz, Object value ) + public static Object upgradeCast( Class clazz, Object value ) { ValueType type = ValueType.typeFor( wrap( clazz ) ); return type.coercion().upgradeCast( value ); diff --git a/rwx/src/main/java/org/commonjava/rwx/util/ProcessorUtils.java b/rwx/src/main/java/org/commonjava/rwx/util/ProcessorUtils.java index 775ae55..0b6fd03 100644 --- a/rwx/src/main/java/org/commonjava/rwx/util/ProcessorUtils.java +++ b/rwx/src/main/java/org/commonjava/rwx/util/ProcessorUtils.java @@ -31,6 +31,11 @@ */ public class ProcessorUtils { + private ProcessorUtils() + { + throw new UnsupportedOperationException( "This is a utility class and cannot be instantiated" ); + } + private static void debug( String message ) { System.out.println( "ProcessorUtils >> " + message ); @@ -40,7 +45,7 @@ private static void debug( String message ) public static Set union( Set... sets ) { - Set es = new HashSet(); + Set es = new HashSet<>(); for ( Set s : sets ) { es.addAll( s ); @@ -73,12 +78,8 @@ public static List getList( Map paramsMap ) public static String getMethodName( String prefix, Element e ) { String fieldName = e.getSimpleName().toString(); - - Character upperCaseChar = Character.toUpperCase( fieldName.charAt( 0 ) ); - StringBuilder sb = new StringBuilder( prefix ); - sb.append( upperCaseChar ); - sb.append( fieldName.substring( 1 ) ); - return sb.toString(); + char upperCaseChar = Character.toUpperCase( fieldName.charAt( 0 ) ); + return prefix + upperCaseChar + fieldName.substring( 1 ); } /** @@ -88,13 +89,13 @@ public static String getMethodName( String prefix, Element e ) * We then choose the common top level package 'org.apache.commons' and name the registry class accordingly as * org.apache.commons.generated.Commons_Registry * If we get more than one top packages, e.g., 'org.apache.commons' and 'com.yourcompany', we simply return 'generated._Registry' - * I am pretty sure there is better way to implement this. Let me know if you can make it with less code. - * @param packageNames - * @return + * I am pretty sure there is a better way to implement this. Let me know if you can make it with less code. + * @param packageNames the set of package names + * @return the registry class name */ public static String getRegistryClassName( Set packageNames ) { - String commonPkgName = null; + String commonPkgName; if ( packageNames.size() == 1 ) { @@ -119,11 +120,7 @@ public static String getRegistryClassName( Set packageNames ) } else { - if ( cur.equals( c ) ) - { - ; // do nothing - } - else + if ( !cur.equals( c ) ) { stop = true; break; @@ -152,7 +149,7 @@ public static String getRegistryClassName( Set packageNames ) if ( commonPkgName.endsWith( "." ) ) { - commonPkgName = commonPkgName.substring( 0, commonPkgName.length() - 1); + commonPkgName = commonPkgName.substring( 0, commonPkgName.length() - 1 ); } else { @@ -160,17 +157,13 @@ public static String getRegistryClassName( Set packageNames ) commonPkgName = commonPkgName.substring( 0, lastDot ); } } - debug("Common package: " + commonPkgName); + debug( "Common package: " + commonPkgName ); String[] split = getPackageAndClassName( commonPkgName ); String lastName = split[1]; Character upperCaseChar = Character.toUpperCase( lastName.charAt( 0 ) ); - StringBuilder simpleName = new StringBuilder(); - simpleName.append( upperCaseChar ); - simpleName.append( lastName.substring( 1 ) ); - - String ret = commonPkgName + "." + GENERATED + "." + simpleName.toString() + "_Registry"; - return ret; + String simpleName = upperCaseChar + lastName.substring( 1 ); + return commonPkgName + "." + GENERATED + "." + simpleName + "_Registry"; } public static String getParserClassName( String type ) @@ -193,7 +186,7 @@ public static String getElementClassByType( String type ) { Pattern pattern = Pattern.compile( ".*List<(.+)>" ); Matcher matcher = pattern.matcher( type ); - while ( matcher.find() ) + if ( matcher.find() ) { return matcher.group( 1 ).trim(); } diff --git a/rwx/src/main/java/org/commonjava/rwx/util/RenderUtils.java b/rwx/src/main/java/org/commonjava/rwx/util/RenderUtils.java index abf2184..b3e9661 100644 --- a/rwx/src/main/java/org/commonjava/rwx/util/RenderUtils.java +++ b/rwx/src/main/java/org/commonjava/rwx/util/RenderUtils.java @@ -36,14 +36,19 @@ */ public class RenderUtils { - private static XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); + private static final XMLOutputFactory OUTPUT_FACTORY = XMLOutputFactory.newInstance(); + + private RenderUtils() + { + throw new UnsupportedOperationException( "This is a utility class and cannot be instantiated" ); + } /** * Serialize a MethodCall, MethodResponse, Map, or List object to XML string. * - * @param rpcObject - * @return - * @throws XmlRpcException + * @param rpcObject the object to be serialized + * @return the XML string + * @throws XmlRpcException if the object cannot be serialized */ public static String toXMLString( Object rpcObject ) throws XmlRpcException { @@ -55,13 +60,13 @@ else if ( rpcObject instanceof MethodResponse ) { return toResponseXMLString( (MethodResponse) rpcObject ); } - else if ( rpcObject instanceof Map ) + else if ( rpcObject instanceof Map ) { - return toStructPartXMLString( (Map) rpcObject ); + return toStructPartXMLString( (Map) rpcObject ); } else if ( rpcObject instanceof List ) { - return toArrayPartXMLString( (List) rpcObject ); + return toArrayPartXMLString( (List) rpcObject ); } else { @@ -69,12 +74,12 @@ else if ( rpcObject instanceof List ) } } - private static String toStructPartXMLString( Map rpcObject ) throws XmlRpcException + private static String toStructPartXMLString( Map rpcObject ) throws XmlRpcException { StringWriter result = new StringWriter(); try { - XMLStreamWriter w = outputFactory.createXMLStreamWriter( result ); + XMLStreamWriter w = OUTPUT_FACTORY.createXMLStreamWriter( result ); writeStruct( w, rpcObject ); w.close(); } @@ -85,12 +90,12 @@ private static String toStructPartXMLString( Map rpcObject ) throws XmlRpcExcept return result.toString(); } - private static String toArrayPartXMLString( List rpcObject ) throws XmlRpcException + private static String toArrayPartXMLString( List rpcObject ) throws XmlRpcException { StringWriter result = new StringWriter(); try { - XMLStreamWriter w = outputFactory.createXMLStreamWriter( result ); + XMLStreamWriter w = OUTPUT_FACTORY.createXMLStreamWriter( result ); writeArray( w, rpcObject ); w.close(); } @@ -106,7 +111,7 @@ private static String toResponseXMLString( MethodResponse methodResponse ) throw StringWriter result = new StringWriter(); try { - XMLStreamWriter w = outputFactory.createXMLStreamWriter( result ); + XMLStreamWriter w = OUTPUT_FACTORY.createXMLStreamWriter( result ); w.writeStartDocument(); w.writeStartElement( RESPONSE ); List params = methodResponse.getParams(); @@ -128,7 +133,7 @@ private static String toRequestXMLString( MethodCall methodCall ) throws XmlRpcE StringWriter result = new StringWriter(); try { - XMLStreamWriter w = outputFactory.createXMLStreamWriter( result ); + XMLStreamWriter w = OUTPUT_FACTORY.createXMLStreamWriter( result ); w.writeStartDocument(); w.writeStartElement( REQUEST ); w.writeStartElement( METHOD_NAME ); @@ -169,11 +174,11 @@ private static void writeValue( XMLStreamWriter w, Object object ) throws XMLStr if ( object instanceof List ) { - writeArray( w, (List) object ); + writeArray( w, (List) object ); } - else if ( object instanceof Map ) + else if ( object instanceof Map ) { - writeStruct( w, (Map) object ); + writeStruct( w, (Map) object ); } else { diff --git a/rwx/src/main/java/org/commonjava/rwx/util/ValueCoercion.java b/rwx/src/main/java/org/commonjava/rwx/util/ValueCoercion.java index 6508bd3..a0c646d 100644 --- a/rwx/src/main/java/org/commonjava/rwx/util/ValueCoercion.java +++ b/rwx/src/main/java/org/commonjava/rwx/util/ValueCoercion.java @@ -19,8 +19,7 @@ public abstract class ValueCoercion { - - private String description; + private final String description; protected ValueCoercion( String description ) { diff --git a/rwx/src/main/java/org/commonjava/rwx/vocab/ValueType.java b/rwx/src/main/java/org/commonjava/rwx/vocab/ValueType.java index df95466..c0034a5 100644 --- a/rwx/src/main/java/org/commonjava/rwx/vocab/ValueType.java +++ b/rwx/src/main/java/org/commonjava/rwx/vocab/ValueType.java @@ -23,6 +23,7 @@ import java.text.DecimalFormatSymbols; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Locale; @@ -65,7 +66,7 @@ public Object fromString( final String value ) throws CoercionException NIL( new ValueCoercion( "NIL-to-null" ) { @Override - public Object fromString( final String value ) throws CoercionException + public Object fromString( final String value ) { return Nil.NIL_VALUE; } @@ -80,7 +81,7 @@ public Object fromString( final String value ) throws CoercionException try { String val = value == null ? null : value.trim(); - return val == null || val.length() < 1 ? null : Integer.parseInt( val ); + return val == null || val.isEmpty() ? null : Integer.parseInt( val ); } catch ( final NumberFormatException e ) { @@ -97,7 +98,7 @@ public Object fromString( final String value ) throws CoercionException try { String val = value == null ? null : value.trim(); - return val == null || val.length() < 1 ? null : Long.parseLong( val ); + return val == null || val.isEmpty() ? null : Long.parseLong( val ); } catch ( final NumberFormatException e ) { @@ -141,7 +142,7 @@ public String toString( final Object value ) throws CoercionException } else { - return Boolean.valueOf( s ) ? "1" : "0"; + return Boolean.parseBoolean( s ) ? "1" : "0"; } } } @@ -156,7 +157,7 @@ public Object fromString( final String value ) else { String val = value.trim(); - return "1".equals( val ) || Boolean.valueOf( val ); + return "1".equals( val ) || Boolean.parseBoolean( val ); } } }, Boolean.class, "boolean" ), @@ -166,7 +167,7 @@ public Object fromString( final String value ) @Override public Object fromString( final String value ) { - return value == null ? null : value; + return value; } }, String.class, "string" ), @@ -178,7 +179,7 @@ public Object fromString( final String value ) throws CoercionException try { String val = value == null ? null : value.trim(); - return val == null || val.length() < 1 ? null : Double.parseDouble( val ); + return val == null || val.isEmpty() ? null : Double.parseDouble( val ); } catch ( final NumberFormatException e ) { @@ -200,7 +201,7 @@ public String toString( final Object value ) } }, Number.class, "double" ), - DATETIME( new ValueCoercion( "DATETIME-to-String (" + DATETIME_FORMAT + ")" ) + DATETIME( new ValueCoercion( "DATETIME-to-String (" + Arrays.toString( DATETIME_FORMAT ) + ")" ) { @Override public Object fromString( String value ) throws CoercionException @@ -260,7 +261,7 @@ public Object fromString( final String value ) throws CoercionException } final byte[] result = Base64.decodeBase64( value.trim() ); - if ( result.length < 1 && value.length() > 0 && !value.equals( "==" ) && !value.equals( "=" ) ) + if ( result.length < 1 && !value.isEmpty() && !value.equals( "==" ) && !value.equals( "=" ) ) { throw new CoercionException( "Invalid Base64 input: " + value ); } @@ -273,11 +274,14 @@ public String toString( final Object value ) throws CoercionException { try { - return value == null ? - null : - new String( Base64.encodeBase64( value instanceof String ? - ( (String) value ).getBytes() : - (byte[]) value ) ); + if ( value == null ) + { + return null; + } + + return new String( Base64.encodeBase64( value instanceof String ? + ( (String) value ).getBytes() : + ( byte[]) value ) ); } catch ( final ClassCastException e ) { @@ -287,11 +291,11 @@ public String toString( final Object value ) throws CoercionException }, byte[].class, "base64" ),; - private String[] tags; + private final String[] tags; - private Class nativeType; + private final Class nativeType; - private ValueCoercion coercion; + private final ValueCoercion coercion; ValueType( final ValueCoercion coercion, final Class nativeType, final String... tags ) { @@ -316,7 +320,7 @@ public static ValueType safeTypeFor( final Object value ) return type == null ? STRING : type; } - public static ValueType typeFor( final Class clazz ) + public static ValueType typeFor( final Class clazz ) { ValueType result = null; for ( final ValueType vt : values() ) @@ -356,7 +360,7 @@ public static ValueType typeFor( final Object value ) public static ValueType typeOf( final String tag ) { - if ( tag == null || tag.trim().length() < 1 ) + if ( tag == null || tag.trim().isEmpty() ) { return STRING; } @@ -375,6 +379,7 @@ public static ValueType typeOf( final String tag ) return STRING; } + @Override public String toString() { return name(); diff --git a/rwx/src/main/java/org/commonjava/rwx/vocab/XmlRpcConstants.java b/rwx/src/main/java/org/commonjava/rwx/vocab/XmlRpcConstants.java index 114648f..98cadf0 100644 --- a/rwx/src/main/java/org/commonjava/rwx/vocab/XmlRpcConstants.java +++ b/rwx/src/main/java/org/commonjava/rwx/vocab/XmlRpcConstants.java @@ -17,6 +17,10 @@ public class XmlRpcConstants { + private XmlRpcConstants() + { + throw new UnsupportedOperationException( "This is a utility class and cannot be instantiated" ); + } public static final String REQUEST = "methodCall"; @@ -44,6 +48,5 @@ public class XmlRpcConstants public static final String NIL = "nil"; - public static final String[] DATETIME_FORMAT = { "yyyyMMdd'T'HHmmss", "yyyyMMdd'T'HH:mm:ss" }; - + protected static final String[] DATETIME_FORMAT = { "yyyyMMdd'T'HHmmss", "yyyyMMdd'T'HH:mm:ss" }; } diff --git a/rwx/src/test/java/org/commonjava/rwx/core/AbstractTest.java b/rwx/src/test/java/org/commonjava/rwx/core/AbstractTest.java index 8dda6e1..dc64de6 100644 --- a/rwx/src/test/java/org/commonjava/rwx/core/AbstractTest.java +++ b/rwx/src/test/java/org/commonjava/rwx/core/AbstractTest.java @@ -15,8 +15,6 @@ */ package org.commonjava.rwx.core; -import javax.xml.stream.XMLStreamException; -import java.io.IOException; import java.io.InputStream; /** @@ -26,7 +24,7 @@ public abstract class AbstractTest { protected static final String DOC_PATH = "xml/"; - protected InputStream getXMLStream( final String name ) throws IOException, XMLStreamException + protected InputStream getXMLStream( final String name ) { return Thread.currentThread().getContextClassLoader().getResourceAsStream( DOC_PATH + name + ".xml" ); } diff --git a/rwx/src/test/java/org/commonjava/rwx/core/XmlRpcParserTest.java b/rwx/src/test/java/org/commonjava/rwx/core/XmlRpcParserTest.java index 63c46d4..65c499e 100644 --- a/rwx/src/test/java/org/commonjava/rwx/core/XmlRpcParserTest.java +++ b/rwx/src/test/java/org/commonjava/rwx/core/XmlRpcParserTest.java @@ -23,12 +23,11 @@ import org.junit.Test; import javax.xml.stream.XMLStreamException; -import java.io.IOException; -import java.text.ParseException; import java.util.List; import java.util.Map; import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertSame; import static junit.framework.TestCase.assertTrue; /** @@ -39,7 +38,7 @@ public class XmlRpcParserTest { @Test - public void simpleRequestTest() throws IOException, XMLStreamException, XmlRpcException + public void simpleRequestTest() throws XMLStreamException, XmlRpcException { final XmlRpcParser parser = new XmlRpcParser( getXMLStream( "simpleRequest" ) ); Object object = parser.parse(); @@ -49,11 +48,11 @@ public void simpleRequestTest() throws IOException, XMLStreamException, XmlRpcEx MethodCall request = (MethodCall) object; String methodName = request.getMethodName(); - assertTrue( "foo".equals( methodName ) ); + assertEquals( "foo", methodName ); } @Test - public void requestWithOneParamTest() throws IOException, XMLStreamException, XmlRpcException + public void requestWithOneParamTest() throws XMLStreamException, XmlRpcException { final XmlRpcParser parser = new XmlRpcParser( getXMLStream( "requestWithOneParam" ) ); Object object = parser.parse(); @@ -61,15 +60,15 @@ public void requestWithOneParamTest() throws IOException, XMLStreamException, Xm MethodCall request = (MethodCall) object; List params = request.getParams(); - assertTrue( params.size() == 1 ); - assertTrue( "test".equals( params.get( 0 ) ) ); + assertEquals( 1, params.size() ); + assertEquals( "test", params.get( 0 ) ); String methodName = request.getMethodName(); - assertTrue( "foo".equals( methodName ) ); + assertEquals( "foo", methodName ); } @Test - public void requestWithOneStructParamTest() throws IOException, XMLStreamException, XmlRpcException + public void requestWithOneStructParamTest() throws XMLStreamException, XmlRpcException { final XmlRpcParser parser = new XmlRpcParser( getXMLStream( "requestWithOneStructParam" ) ); Object object = parser.parse(); @@ -77,20 +76,20 @@ public void requestWithOneStructParamTest() throws IOException, XMLStreamExcepti MethodCall request = (MethodCall) object; List params = request.getParams(); - assertTrue( params.size() == 1 ); + assertEquals( 1, params.size() ); Object param = params.get( 0 ); assertTrue( param instanceof Map ); - Map struct = (Map) param; - assertTrue( "test".equals( struct.get( "key" ) ) ); + Map struct = (Map) param; + assertEquals( "test", struct.get( "key" ) ); String methodName = request.getMethodName(); - assertTrue( "foo".equals( methodName ) ); + assertEquals( "foo", methodName ); } @Test - public void requestWithOneArrayParamTest() throws IOException, XMLStreamException, XmlRpcException + public void requestWithOneArrayParamTest() throws XMLStreamException, XmlRpcException { final XmlRpcParser parser = new XmlRpcParser( getXMLStream( "requestWithOneArrayParam" ) ); Object object = parser.parse(); @@ -98,20 +97,20 @@ public void requestWithOneArrayParamTest() throws IOException, XMLStreamExceptio MethodCall request = (MethodCall) object; List params = request.getParams(); - assertTrue( params.size() == 1 ); + assertEquals( 1, params.size() ); Object param = params.get( 0 ); assertTrue( param instanceof List ); - List array = (List) param; - assertTrue( "test".equals( array.get( 0 ) ) ); + List array = (List) param; + assertEquals( "test", array.get( 0 ) ); String methodName = request.getMethodName(); - assertTrue( "foo".equals( methodName ) ); + assertEquals( "foo", methodName ); } @Test - public void requestWithArrayInStructTest() throws IOException, XMLStreamException, XmlRpcException + public void requestWithArrayInStructTest() throws XMLStreamException, XmlRpcException { final XmlRpcParser parser = new XmlRpcParser( getXMLStream( "requestWithArrayInStruct" ) ); Object object = parser.parse(); @@ -119,22 +118,22 @@ public void requestWithArrayInStructTest() throws IOException, XMLStreamExceptio MethodCall request = (MethodCall) object; List params = request.getParams(); - assertTrue( params.size() == 1 ); + assertEquals( 1, params.size() ); Object param = params.get( 0 ); assertTrue( param instanceof Map ); - Map struct = (Map) param; + Map struct = (Map) param; - List array = (List) struct.get( "key" ); - assertTrue( "test".equals( array.get( 0 ) ) ); + List array = (List) struct.get( "key" ); + assertEquals( "test", array.get( 0 ) ); String methodName = request.getMethodName(); - assertTrue( "foo".equals( methodName ) ); + assertEquals( "foo", methodName ); } @Test - public void kojiMulticallRequestTest() throws IOException, XMLStreamException, XmlRpcException + public void kojiMulticallRequestTest() throws XMLStreamException, XmlRpcException { final XmlRpcParser parser = new XmlRpcParser( getXMLStream( "kojiMulticallRequest" ) ); Object object = parser.parse(); @@ -144,24 +143,24 @@ public void kojiMulticallRequestTest() throws IOException, XMLStreamException, X MethodCall request = (MethodCall) object; List params = request.getParams(); - assertTrue( params.size() == 1 ); + assertEquals( 1, params.size() ); - List array = (List) params.get( 0 ); + List array = (List) params.get( 0 ); - Map value1 = (Map) array.get( 0 ); + Map value1 = (Map) array.get( 0 ); assertEquals( "getBuild", value1.get( "methodName" ) ); - assertEquals( nvr, ( (List) value1.get( "params" ) ).get( 0 ) ); + assertEquals( nvr, ( (List) value1.get( "params" ) ).get( 0 ) ); - Map value2 = (Map) array.get( 1 ); + Map value2 = (Map) array.get( 1 ); assertEquals( "listTags", value2.get( "methodName" ) ); - assertEquals( nvr, ( (List) value2.get( "params" ) ).get( 0 ) ); + assertEquals( nvr, ( (List) value2.get( "params" ) ).get( 0 ) ); String methodName = request.getMethodName(); - assertTrue( "multiCall".equals( methodName ) ); + assertEquals( "multiCall", methodName ); } @Test - public void simpleResponseTest() throws IOException, XMLStreamException, XmlRpcException + public void simpleResponseTest() throws XMLStreamException, XmlRpcException { final XmlRpcParser parser = new XmlRpcParser( getXMLStream( "simpleResponse" ) ); Object object = parser.parse(); @@ -171,15 +170,15 @@ public void simpleResponseTest() throws IOException, XMLStreamException, XmlRpcE MethodResponse response = (MethodResponse) object; List params = response.getParams(); - assertTrue( params.size() == 1 ); + assertEquals( 1, params.size() ); Object p = params.get( 0 ); assertTrue( p instanceof Double ); - assertTrue( ( (Double) p ).doubleValue() == 18.24668429131D ); + assertEquals( 18.24668429131D, p ); } @Test - public void simpleFaultResponseTest() throws IOException, XMLStreamException, XmlRpcException + public void simpleFaultResponseTest() throws XMLStreamException, XmlRpcException { final XmlRpcParser parser = new XmlRpcParser( getXMLStream( "simpleFault" ) ); Object object = parser.parse(); @@ -195,15 +194,15 @@ public void simpleFaultResponseTest() throws IOException, XMLStreamException, Xm Object p = m.get( "faultCode" ); assertTrue( p instanceof Integer ); - assertTrue( ( (Integer) p ).intValue() == 101 ); + assertEquals( 101, ( (Integer) p ).intValue() ); p = m.get( "faultString" ); assertTrue( p instanceof String ); - assertTrue( "foo".equals( p ) ); + assertEquals("foo", p); } @Test - public void jiraServerInfoTest() throws IOException, XMLStreamException, XmlRpcException, ParseException + public void jiraServerInfoTest() throws XMLStreamException, XmlRpcException { final XmlRpcParser parser = new XmlRpcParser( getXMLStream( "jiraServerInfoResponse" ) ); Object object = parser.parse(); @@ -215,14 +214,14 @@ public void jiraServerInfoTest() throws IOException, XMLStreamException, XmlRpcE Map struct = (Map) p; - assertTrue( struct.get( "version" ).equals( "4.1.2" ) ); - assertTrue( struct.get( "edition" ).equals( "Enterprise" ) ); - assertTrue( struct.get( "buildNumber" ).equals( 531 ) ); - assertTrue( struct.get( "buildDate" ).equals( "Mon Jun 07 00:00:00 CDT 2010" ) ); + assertEquals( "4.1.2", struct.get( "version" ) ); + assertEquals( "Enterprise", struct.get( "edition" ) ); + assertEquals( 531, struct.get( "buildNumber" ) ); + assertEquals( "Mon Jun 07 00:00:00 CDT 2010", struct.get( "buildDate" ) ); } @Test - public void kojiGetBuildResponseTest() throws IOException, XMLStreamException, XmlRpcException, ParseException + public void kojiGetBuildResponseTest() throws XMLStreamException, XmlRpcException { final XmlRpcParser parser = new XmlRpcParser( getXMLStream( "kojiGetBuildResponse" ) ); Object object = parser.parse(); @@ -234,15 +233,15 @@ public void kojiGetBuildResponseTest() throws IOException, XMLStreamException, X Map struct = (Map) p; - assertTrue( struct.get( "package_name" ).equals( "org.dashbuilder-dashbuilder-parent-metadata" ) ); - assertTrue( struct.get( "extra" ) == Nil.NIL_VALUE ); - assertTrue( struct.get( "creation_time" ).equals( "2016-09-15 21:24:04.843726" ) ); - assertTrue( struct.get( "package_id" ).equals( 48475 ) ); - assertTrue( struct.get( "completion_ts" ).equals( Double.parseDouble( "1473974644.95959" ) ) ); + assertEquals( "org.dashbuilder-dashbuilder-parent-metadata", struct.get( "package_name" ) ); + assertSame( Nil.NIL_VALUE, struct.get( "extra" ) ); + assertEquals( "2016-09-15 21:24:04.843726", struct.get( "creation_time" ) ); + assertEquals( 48475, struct.get( "package_id" ) ); + assertEquals( struct.get( "completion_ts" ), Double.parseDouble( "1473974644.95959" ) ); } @Test - public void kojiMulticallResponseTest() throws IOException, XMLStreamException, XmlRpcException, ParseException + public void kojiMulticallResponseTest() throws XMLStreamException, XmlRpcException { final XmlRpcParser parser = new XmlRpcParser( getXMLStream( "kojiMulticallResponse" ) ); Object object = parser.parse(); @@ -252,31 +251,31 @@ public void kojiMulticallResponseTest() throws IOException, XMLStreamException, Object p = response.getParams().get( 0 ); assertTrue( p instanceof List ); - List array = (List) p; + List array = (List) p; - List array1 = (List) array.get( 0 ); - Map struct = (Map) array1.get( 0 ); + List array1 = (List) array.get( 0 ); + Map struct = (Map) array1.get( 0 ); assertEquals( "org.dashbuilder-dashbuilder-parent-metadata", struct.get( "package_name" ) ); assertEquals( Nil.NIL_VALUE, struct.get( "extra" ) ); assertEquals( 48475, struct.get( "package_id" ) ); assertEquals( "0.4.0.Final", struct.get( "version" ) ); - List array2 = (List) array.get( 1 ); - List array2_1 = (List) array2.get( 0 ); + List array2 = (List) array.get( 1 ); + List array21 = (List) array2.get( 0 ); - Map tag1 = (Map) array2_1.get( 0 ); + Map tag1 = (Map) array21.get( 0 ); assertEquals( true, tag1.get( "maven_support" ) ); assertEquals( "jb-bxms-6.3-candidate", tag1.get( "name" ) ); - Map tag2 = (Map) array2_1.get( 1 ); + Map tag2 = (Map) array21.get( 1 ); assertEquals( true, tag2.get( "maven_support" ) ); assertEquals( "jb-cs-maven-candidate", tag2.get( "name" ) ); - Map tag3 = (Map) array2_1.get( 2 ); + Map tag3 = (Map) array21.get( 2 ); assertEquals( true, tag3.get( "maven_support" ) ); assertEquals( "jb-fis-2.0-maven-imports", tag3.get( "name" ) ); - Map tag4 = (Map) array2_1.get( 3 ); + Map tag4 = (Map) array21.get( 3 ); assertEquals( true, tag4.get( "maven_support" ) ); assertEquals( "jb-mm-7.0-maven-candidate", tag4.get( "name" ) ); } @@ -294,6 +293,6 @@ public void kojiGetBuildTypeNilResponseTest() throws Exception Map struct = (Map) p; - assertTrue( struct.get( "rpm" ) == Nil.NIL_VALUE ); + assertSame( Nil.NIL_VALUE, struct.get( "rpm" ) ); } } diff --git a/rwx/src/test/java/org/commonjava/rwx/core/util/ProcessorUtilsTest.java b/rwx/src/test/java/org/commonjava/rwx/core/util/ProcessorUtilsTest.java index 8aa2ba6..8d5303b 100644 --- a/rwx/src/test/java/org/commonjava/rwx/core/util/ProcessorUtilsTest.java +++ b/rwx/src/test/java/org/commonjava/rwx/core/util/ProcessorUtilsTest.java @@ -24,6 +24,7 @@ import java.util.Set; import static junit.framework.TestCase.assertEquals; +import static org.junit.Assert.assertNull; /** * Created by ruhan on 8/1/17. @@ -52,12 +53,12 @@ public void getRegistryNameTest() public void getElementClassByTypeTest() { String type = "java.util.List"; - assertEquals("java.lang.String", getElementClassByType(type)); + assertEquals( "java.lang.String", getElementClassByType( type ) ); type = "List"; - assertEquals("java.lang.String", getElementClassByType(type)); + assertEquals( "java.lang.String", getElementClassByType( type ) ); type = "List"; - assertEquals(null, getElementClassByType(type)); + assertNull( getElementClassByType( type ) ); } } diff --git a/rwx/src/test/java/org/commonjava/rwx/vocab/NilTest.java b/rwx/src/test/java/org/commonjava/rwx/vocab/NilTest.java index 5068822..c2f22d0 100644 --- a/rwx/src/test/java/org/commonjava/rwx/vocab/NilTest.java +++ b/rwx/src/test/java/org/commonjava/rwx/vocab/NilTest.java @@ -24,14 +24,14 @@ import java.io.ObjectOutputStream; import static junit.framework.TestCase.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertSame; public class NilTest { @Test public void serializationTest() throws IOException, ClassNotFoundException { - Object result = null; + Object result; try ( ByteArrayOutputStream bout = new ByteArrayOutputStream(); ObjectOutputStream out = new ObjectOutputStream( bout ) ) { @@ -46,9 +46,6 @@ public void serializationTest() throws IOException, ClassNotFoundException } assertEquals( Nil.NIL_VALUE, result ); - - assertEquals( result, Nil.NIL_VALUE ); - - assertTrue( Nil.NIL_VALUE == result ); + assertSame( Nil.NIL_VALUE, result ); } }