Skip to content

Fix charsets and locales #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dwalluck wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix charsets and locales #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions rwx-test/src/test/java/org/commonjava/rwx/test/jira/JiraServerInfoArrayConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand All @@ -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;
Expand All @@ -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 ) );
Expand Down
11 changes: 6 additions & 5 deletions rwx-test/src/test/java/org/commonjava/rwx/test/jira/JiraServerInfoConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand All @@ -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;
Expand All @@ -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() );
Expand All @@ -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() );
Expand Down
13 changes: 7 additions & 6 deletions rwx-test/src/test/java/org/commonjava/rwx/test/koji/KojiMultiCallTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand All @@ -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;
Expand Down Expand Up @@ -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 );
Expand All @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down
25 changes: 13 additions & 12 deletions rwx-test/src/test/java/org/commonjava/rwx/test/koji/KojiRWXMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand All @@ -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;

Expand All @@ -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();
Expand All @@ -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() );
}
Expand All @@ -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(
Expand All @@ -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() );
}
Expand All @@ -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() );
Expand All @@ -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 );
Expand All @@ -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() );

Expand All @@ -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 );
Expand Down
5 changes: 3 additions & 2 deletions rwx-test/src/test/java/org/commonjava/rwx/test/simple/I8MapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand All @@ -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;
Expand Down Expand Up @@ -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() );
Expand Down
5 changes: 3 additions & 2 deletions rwx-test/src/test/java/org/commonjava/rwx/test/simple/SimpleRWXMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand All @@ -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;
Expand Down Expand Up @@ -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 ) );
Expand Down
11 changes: 6 additions & 5 deletions rwx/src/main/java/org/commonjava/rwx/vocab/ValueType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand All @@ -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;
Expand Down Expand Up @@ -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 )
Expand All @@ -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 )
{
Expand Down Expand Up @@ -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 )
{
Expand Down
Loading