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

[MNG-6844] Use StandardCharsets and remove outdated @SuppressWarnings 

This closes #312
This commit is contained in:
Artem Krosheninnikov 2020-01-09 11:12:22 +03:00 committed by Michael Osipov
parent f3e6641c2e
commit 735b72fcf1
10 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
View File

@ -26,6 +26,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
/**
* Tests that the global settings.xml shipped with the distribution is in good state.
@ -44,7 +45,7 @@ public class GlobalSettingsTest
File globalSettingsFile = new File( basedir, "src/conf/settings.xml" );
assertTrue( globalSettingsFile.getAbsolutePath(), globalSettingsFile.isFile() );
try ( Reader reader = new InputStreamReader( new FileInputStream( globalSettingsFile ), "UTF-8" ) )
try ( Reader reader = new InputStreamReader( new FileInputStream( globalSettingsFile ), StandardCharsets.UTF_8) )
{
new SettingsXpp3Reader().read( reader );
}

3
maven-builder-support/src/main/java/org/apache/maven/building/StringSource.java
View File

@ -22,6 +22,7 @@ package org.apache.maven.building;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
/**
* Wraps an ordinary {@link CharSequence} as a source.
@ -62,7 +63,7 @@ public class StringSource
public InputStream getInputStream()
throws IOException
{
return new ByteArrayInputStream( content.getBytes( "UTF-8" ) );
return new ByteArrayInputStream( content.getBytes( StandardCharsets.UTF_8 ) );
}
@Override

3
maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
View File

@ -55,7 +55,6 @@ public class DefaultModelInheritanceAssembler
implements ModelInheritanceAssembler
{
// TODO Remove this!
@SuppressWarnings( "unchecked" )
public void assembleBuildInheritance( Build childBuild, Build parentBuild, boolean handleAsInheritance )
{
// The build has been set but we want to step in here and fill in
@ -307,7 +306,6 @@ public class DefaultModelInheritanceAssembler
}
// TODO Remove this!
@SuppressWarnings( "unchecked" )
private void assembleDependencyManagementInheritance( Model child, Model parent )
{
DependencyManagement parentDepMgmt = parent.getDependencyManagement();
@ -527,7 +525,6 @@ public class DefaultModelInheritanceAssembler
}
// TODO Remove this!
@SuppressWarnings( "unchecked" )
private void assembleDependencyInheritance( Model child, Model parent )
{
Map<String, Dependency> depsMap = new LinkedHashMap<>();

3
maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
View File

@ -59,6 +59,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@ -293,7 +294,7 @@ public abstract class AbstractArtifactComponentTestCase
{
artifactFile.getParentFile().mkdirs();
}
try ( Writer writer = new OutputStreamWriter( new FileOutputStream( artifactFile ), "ISO-8859-1" ) )
try ( Writer writer = new OutputStreamWriter( new FileOutputStream( artifactFile ), StandardCharsets.ISO_8859_1) )
{
writer.write( artifact.getId() );
}

10
maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
View File

@ -22,6 +22,7 @@ package org.apache.maven.repository.legacy;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
@ -72,14 +73,7 @@ public class StringWagon
resource.setContentLength( content.length() );
resource.setLastModified( System.currentTimeMillis() );
try
{
inputData.setInputStream( new ByteArrayInputStream( content.getBytes( "UTF-8" ) ) );
}
catch ( UnsupportedEncodingException e )
{
throw new Error( "broken JVM", e );
}
inputData.setInputStream( new ByteArrayInputStream( content.getBytes( StandardCharsets.UTF_8 ) ) );
}
else
{

1
maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
View File

@ -33,7 +33,6 @@ public class ArtifactHandlerTest
{
File apt = getTestFile( "src/site/apt/artifact-handlers.apt" );
@SuppressWarnings( "unchecked" )
List<String> lines = FileUtils.loadFile( apt );
for ( String line : lines )

1
maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java
View File

@ -47,7 +47,6 @@ public class DefaultLifecyclesStub
List<String> stubSiteCycle =
Arrays.asList( PRE_SITE.getPhase(), SITE.getPhase(), POST_SITE.getPhase(), SITE_DEPLOY.getPhase() );
@SuppressWarnings( "unchecked" )
Iterator<List<String>> lcs = Arrays.asList( stubDefaultCycle, stubCleanCycle, stubSiteCycle ).iterator();
Map<String, Lifecycle> lifeCycles = new HashMap<>();

11
maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
View File

@ -25,7 +25,7 @@ import static org.junit.Assert.assertThat;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import junit.framework.TestCase;
@ -61,14 +61,7 @@ public class ExtensionDescriptorBuilderTest
private InputStream toStream( String xml )
{
try
{
return new ByteArrayInputStream( xml.getBytes( "UTF-8" ) );
}
catch ( UnsupportedEncodingException e )
{
throw new IllegalStateException( e );
}
return new ByteArrayInputStream( xml.getBytes( StandardCharsets.UTF_8 ) );
}
public void testEmptyDescriptor()

2
maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
View File

@ -107,7 +107,7 @@ public class CLIManager
protected Options options;
@SuppressWarnings( { "static-access", "checkstyle:linelength" } )
@SuppressWarnings( "checkstyle:linelength" )
public CLIManager()
{
options = new Options();

1
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
View File

@ -72,7 +72,6 @@ class ProblemDetectingValueSource
}
@Override
@SuppressWarnings( "unchecked" )
public List getFeedback()
{
return valueSource.getFeedback();