Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

start fixing issues reported by modernizer maven plugin

This commit is contained in:
Olivier Lamy 2014-10-15 14:10:04 +11:00
parent d2fcfdd21f
commit dce9401cd3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/archiva/xml/XMLReader.java
View File

@ -36,6 +36,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@ -99,7 +100,7 @@ public class XMLReader
try (InputStream in = url.openStream())
{
InputStreamReader inReader = new InputStreamReader( in, "UTF-8" );
InputStreamReader inReader = new InputStreamReader( in, Charset.forName( "UTF-8" ) );
LatinEntityResolutionReader latinReader = new LatinEntityResolutionReader( inReader );
this.document = reader.read( latinReader );
}

9
archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java
View File

@ -22,6 +22,7 @@ package org.apache.archiva.xml;
import org.dom4j.DocumentException;
import org.dom4j.io.SAXReader;
import org.junit.Assert;
import org.junit.Test;
import java.io.BufferedReader;
import java.io.File;
@ -32,12 +33,10 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringWriter;
import java.net.URL;
import org.junit.Test;
import java.nio.charset.Charset;
/**
* LatinEntityResolutionReaderTest
*
*
*/
public class LatinEntityResolutionReaderTest
extends AbstractArchivaXmlTestCase
@ -140,7 +139,7 @@ public class LatinEntityResolutionReaderTest
fail( "IOException: " + e.getMessage() );
}
}
@Test
public void testReaderNormalBufsize()
throws IOException
@ -215,7 +214,7 @@ public class LatinEntityResolutionReaderTest
SAXReader reader = new SAXReader();
URL url = inputFile.toURL();
in = url.openStream();
InputStreamReader inReader = new InputStreamReader( in, "UTF-8" );
InputStreamReader inReader = new InputStreamReader( in, Charset.forName( "UTF-8" ) );
LatinEntityResolutionReader latinReader = new LatinEntityResolutionReader( inReader );
try
{