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 6c2e87f..6eebffc 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 @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2010 Red Hat, Inc. (http://github.com/Commonjava/commonjava) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,6 +19,7 @@ import org.commonjava.rwx.test.AbstractTest; import org.junit.Test; +import java.nio.charset.StandardCharsets; import java.io.ByteArrayInputStream; import static junit.framework.TestCase.assertEquals; @@ -33,12 +34,12 @@ public class JiraServerInfoArrayConverterTest public void roundTrip() throws Exception { String source = getXMLString( "jiraServerInfoArrayResponse" ); - JiraServerInfoArrayResponse response = new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), + JiraServerInfoArrayResponse response = new RWXMapper().parse( new ByteArrayInputStream( source.getBytes( StandardCharsets.UTF_8 ) ), JiraServerInfoArrayResponse.class ); String rendered = new RWXMapper().render( response ); JiraServerInfoArrayResponse renderedResponse = - new RWXMapper().parse( new ByteArrayInputStream( rendered.getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( rendered.getBytes( StandardCharsets.UTF_8 ) ), JiraServerInfoArrayResponse.class ); assertJiraServerInfo( (JiraServerInfo) renderedResponse.getValues().get( 0 ) ); 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 d5274d9..bc9f63c 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 @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2010 Red Hat, Inc. (http://github.com/Commonjava/commonjava) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,6 +19,7 @@ import org.commonjava.rwx.test.AbstractTest; import org.junit.Test; +import java.nio.charset.StandardCharsets; import java.io.ByteArrayInputStream; import static junit.framework.TestCase.assertEquals; @@ -33,14 +34,14 @@ public class JiraServerInfoConverterTest public void roundTrip_jiraServerInfoResponse() throws Exception { String source = getXMLString( "jiraServerInfoResponse" ); - JiraServerInfoResponse response = new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), + JiraServerInfoResponse response = new RWXMapper().parse( new ByteArrayInputStream( source.getBytes( StandardCharsets.UTF_8 ) ), JiraServerInfoResponse.class ); assertJiraServerInfo( (JiraServerInfo) response.getValue() ); String rendered = new RWXMapper().render( response ); JiraServerInfoResponse renderedResponse = - new RWXMapper().parse( new ByteArrayInputStream( rendered.getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( rendered.getBytes( StandardCharsets.UTF_8 ) ), JiraServerInfoResponse.class ); assertJiraServerInfo( (JiraServerInfo) renderedResponse.getValue() ); @@ -51,14 +52,14 @@ public void roundTrip_jiraServerInfoResponseVariantOne() throws Exception { String source = getXMLString( "jiraServerInfoResponse" ); JiraServerInfoResponseVariantOne response = - new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( source.getBytes( StandardCharsets.UTF_8 ) ), JiraServerInfoResponseVariantOne.class ); assertJiraServerInfo( (JiraServerInfo) response.getValue() ); String rendered = new RWXMapper().render( response ); JiraServerInfoResponseVariantOne renderedResponse = - new RWXMapper().parse( new ByteArrayInputStream( rendered.getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( rendered.getBytes( StandardCharsets.UTF_8 ) ), JiraServerInfoResponseVariantOne.class ); assertJiraServerInfo( (JiraServerInfo) renderedResponse.getValue() ); 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 33c53b2..fb770d4 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 @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2010 Red Hat, Inc. (http://github.com/Commonjava/commonjava) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,6 +20,7 @@ import org.commonjava.rwx.test.AbstractTest; import org.junit.Test; +import java.nio.charset.StandardCharsets; import java.io.ByteArrayInputStream; import java.util.ArrayList; import java.util.List; @@ -82,7 +83,7 @@ public void multiCallRequest_renderTest() throws Exception request.setMultiCallObjs( multiObjs ); MultiCallRequest rounded = - new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( request ).getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( request ).getBytes( StandardCharsets.UTF_8 ) ), MultiCallRequest.class ); assertMultiCallRequest( rounded ); @@ -93,12 +94,12 @@ public void roundTrip_MultiCallRequest() throws Exception { String source = getXMLString( "kojiMulticallRequest" ); MultiCallRequest parsed = - new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), MultiCallRequest.class ); + new RWXMapper().parse( new ByteArrayInputStream( source.getBytes( StandardCharsets.UTF_8 ) ), MultiCallRequest.class ); assertMultiCallRequest( parsed ); MultiCallRequest rounded = - new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes( StandardCharsets.UTF_8 ) ), MultiCallRequest.class ); assertMultiCallRequest( rounded ); @@ -131,12 +132,12 @@ public void roundTrip_MultiCallResponse() throws Exception { String source = getXMLString( "kojiMulticallResponse" ); MultiCallResponse parsed = - new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), MultiCallResponse.class ); + new RWXMapper().parse( new ByteArrayInputStream( source.getBytes( StandardCharsets.UTF_8 ) ), MultiCallResponse.class ); assertMultiCallResponse( parsed ); MultiCallResponse rounded = - new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes( StandardCharsets.UTF_8 ) ), MultiCallResponse.class ); assertMultiCallResponse( rounded ); 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 2b41e87..c33521b 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 @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2010 Red Hat, Inc. (http://github.com/Commonjava/commonjava) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,6 +19,7 @@ import org.commonjava.rwx.test.AbstractTest; import org.junit.Test; +import java.nio.charset.StandardCharsets; import java.io.ByteArrayInputStream; import java.util.List; @@ -37,7 +38,7 @@ public class KojiRWXMapperTest public void roundTrip_KrbLoginRequest() throws Exception { String source = getXMLString( "kojiKrbLoginRequest" ); - KrbLoginRequest parsed = new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), + KrbLoginRequest parsed = new RWXMapper().parse( new ByteArrayInputStream( source.getBytes( StandardCharsets.UTF_8 ) ), KrbLoginRequest.class ); KrbLoginRequest expected = new KrbLoginRequest(); @@ -47,7 +48,7 @@ public void roundTrip_KrbLoginRequest() throws Exception assertEquals( expected.getKrbRequest(), parsed.getKrbRequest() ); KrbLoginRequest rounded = - new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes( StandardCharsets.UTF_8 ) ), KrbLoginRequest.class ); assertEquals( expected.getKrbRequest(), rounded.getKrbRequest() ); } @@ -56,7 +57,7 @@ public void roundTrip_KrbLoginRequest() throws Exception public void roundTrip_GetBuildByNVRObjRequest() throws Exception { String source = getXMLString( "kojiGetBuildByNVRObjRequest" ); - GetBuildByNVRObjRequest parsed = new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), + GetBuildByNVRObjRequest parsed = new RWXMapper().parse( new ByteArrayInputStream( source.getBytes( StandardCharsets.UTF_8 ) ), GetBuildByNVRObjRequest.class ); GetBuildByNVRObjRequest expected = new GetBuildByNVRObjRequest( @@ -65,7 +66,7 @@ public void roundTrip_GetBuildByNVRObjRequest() throws Exception assertEquals( expected.getNvr().renderString(), parsed.getNvr().renderString() ); GetBuildByNVRObjRequest rounded = - new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes( StandardCharsets.UTF_8 ) ), GetBuildByNVRObjRequest.class ); assertEquals( expected.getNvr().renderString(), rounded.getNvr().renderString() ); } @@ -75,14 +76,14 @@ public void roundTrip_GetBuildRequest() throws Exception { String source = getXMLString( "kojiGetBuildRequest" ); GetBuildRequest parsed = - new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), GetBuildRequest.class ); + new RWXMapper().parse( new ByteArrayInputStream( source.getBytes( StandardCharsets.UTF_8 ) ), GetBuildRequest.class ); GetBuildRequest expected = new GetBuildRequest( "org.dashbuilder-dashbuilder-parent-metadata-0.4.0.Final-1" ); assertEquals( expected.getNvr(), parsed.getNvr() ); GetBuildRequest rounded = - new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes( StandardCharsets.UTF_8 ) ), GetBuildRequest.class ); assertEquals( expected.getNvr(), rounded.getNvr() ); @@ -94,12 +95,12 @@ public void roundTrip_GetBuildResponse() throws Exception String source = getXMLString( "kojiGetBuildResponse" ); GetBuildResponse parsed = - new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), GetBuildResponse.class ); + new RWXMapper().parse( new ByteArrayInputStream( source.getBytes( StandardCharsets.UTF_8 ) ), GetBuildResponse.class ); assertGetBuildResponse( parsed ); GetBuildResponse rounded = - new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes( StandardCharsets.UTF_8 ) ), GetBuildResponse.class ); assertGetBuildResponse( rounded ); @@ -122,7 +123,7 @@ public void roundTrip_ListBuildResponseNIL() throws Exception { String source = getXMLStringIgnoreFormat( "kojiListBuildsResponseNIL" ); ListBuildResponse parsed = - new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), ListBuildResponse.class ); + new RWXMapper().parse( new ByteArrayInputStream( source.getBytes( StandardCharsets.UTF_8 ) ), ListBuildResponse.class ); assertNull( parsed.getBuilds() ); @@ -136,12 +137,12 @@ public void roundTrip_ListTagsResponse() throws Exception { String source = getXMLString( "kojiListTagsResponse" ); ListTagsResponse parsed = - new RWXMapper().parse( new ByteArrayInputStream( source.getBytes() ), ListTagsResponse.class ); + new RWXMapper().parse( new ByteArrayInputStream( source.getBytes( StandardCharsets.UTF_8 ) ), ListTagsResponse.class ); assertListTagsResponse( parsed ); ListTagsResponse rounded = - new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes() ), + new RWXMapper().parse( new ByteArrayInputStream( new RWXMapper().render( parsed ).getBytes( StandardCharsets.UTF_8 ) ), ListTagsResponse.class ); assertListTagsResponse( rounded ); diff --git a/rwx-test/src/test/java/org/commonjava/rwx/test/simple/I8MapperTest.java b/rwx-test/src/test/java/org/commonjava/rwx/test/simple/I8MapperTest.java index 98d1878..b9cec70 100644 --- a/rwx-test/src/test/java/org/commonjava/rwx/test/simple/I8MapperTest.java +++ b/rwx-test/src/test/java/org/commonjava/rwx/test/simple/I8MapperTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2010 Red Hat, Inc. (http://github.com/Commonjava/commonjava) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,6 +19,7 @@ import org.commonjava.rwx.test.AbstractTest; import org.junit.Test; +import java.nio.charset.StandardCharsets; import java.io.ByteArrayInputStream; import static junit.framework.TestCase.assertEquals; @@ -53,7 +54,7 @@ public void roundTrip_ResponseTest() throws Exception String rendered = new RWXMapper().render( response ); //System.out.println( ">>> " + rendered ); - I8Response parsed = new RWXMapper().parse( new ByteArrayInputStream( rendered.getBytes() ), I8Response.class ); + I8Response parsed = new RWXMapper().parse( new ByteArrayInputStream( rendered.getBytes( StandardCharsets.UTF_8 ) ), I8Response.class ); assertEquals( parsed.getIntValue(), response.getIntValue() ); assertEquals( parsed.getLongValue(), response.getLongValue() ); assertEquals( parsed.getLongPrimitive(), response.getLongPrimitive() ); 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 37cb4f1..b9ccb91 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 @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2010 Red Hat, Inc. (http://github.com/Commonjava/commonjava) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,6 +19,7 @@ import org.commonjava.rwx.test.AbstractTest; import org.junit.Test; +import java.nio.charset.StandardCharsets; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.Arrays; @@ -60,7 +61,7 @@ public void roundTrip_RequestWithOneArrayParamTest() throws Exception String expected = getXMLStringIgnoreFormat( "requestWithOneArrayParam" ); assertEquals( expected, formalizeXMLString( request ) ); - RequestWithOneArrayParam parsed = new RWXMapper().parse( new ByteArrayInputStream( request.getBytes() ), + RequestWithOneArrayParam parsed = new RWXMapper().parse( new ByteArrayInputStream( request.getBytes( StandardCharsets.UTF_8 ) ), RequestWithOneArrayParam.class ); assertEquals( parsed.getArray().get( 0 ), array.get( 0 ) ); assertEquals( parsed.getArray().get( 1 ), array.get( 1 ) ); 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 9f7b702..8e71087 100644 --- a/rwx/src/main/java/org/commonjava/rwx/vocab/ValueType.java +++ b/rwx/src/main/java/org/commonjava/rwx/vocab/ValueType.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2010 Red Hat, Inc. (http://github.com/Commonjava/commonjava) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,6 +19,7 @@ import org.commonjava.rwx.error.CoercionException; import org.commonjava.rwx.util.ValueCoercion; +import java.nio.charset.StandardCharsets; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.ParseException; @@ -217,7 +218,7 @@ public Object fromString( String value ) throws CoercionException { try { - obj = new SimpleDateFormat( format ).parse( value ); + obj = new SimpleDateFormat( format, Locale.ENGLISH ).parse( value ); break; } catch ( final ParseException e ) @@ -240,7 +241,7 @@ public String toString( final Object value ) throws CoercionException { try { - return value == null ? null : new SimpleDateFormat( DATETIME_FORMAT[0] ).format( (Date) value ); + return value == null ? null : new SimpleDateFormat( DATETIME_FORMAT[0], Locale.ENGLISH ).format( (Date) value ); } catch ( final ClassCastException e ) { @@ -280,8 +281,8 @@ public String toString( final Object value ) throws CoercionException } return new String( Base64.encodeBase64( value instanceof String ? - ( (String) value ).getBytes() : - ( byte[]) value ) ); + ( (String) value ).getBytes( StandardCharsets.UTF_8 ) : + ( byte[]) value ), StandardCharsets.US_ASCII ); } catch ( final ClassCastException e ) {