You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/01/09 17:10:12 UTC
[maven] branch MNG-6844 created (now 735b72f)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6844
in repository https://gitbox.apache.org/repos/asf/maven.git.
at 735b72f [MNG-6844] Use StandardCharsets and remove outdated @SuppressWarnings
This branch includes the following new commits:
new 735b72f [MNG-6844] Use StandardCharsets and remove outdated @SuppressWarnings
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 01/01: [MNG-6844] Use StandardCharsets and remove outdated
@SuppressWarnings
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6844
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 735b72fcf1b848ee424d6755e5a624fbcbc65862
Author: Artem Krosheninnikov <fe...@gmail.com>
AuthorDate: Thu Jan 9 11:12:22 2020 +0300
[MNG-6844] Use StandardCharsets and remove outdated @SuppressWarnings
This closes #312
---
.../java/org/apache/maven/settings/GlobalSettingsTest.java | 3 ++-
.../src/main/java/org/apache/maven/building/StringSource.java | 3 ++-
.../project/inheritance/DefaultModelInheritanceAssembler.java | 3 ---
.../maven/artifact/AbstractArtifactComponentTestCase.java | 3 ++-
.../java/org/apache/maven/repository/legacy/StringWagon.java | 10 ++--------
.../apache/maven/artifact/handler/ArtifactHandlerTest.java | 1 -
.../maven/lifecycle/internal/stub/DefaultLifecyclesStub.java | 1 -
.../apache/maven/project/ExtensionDescriptorBuilderTest.java | 11 ++---------
.../src/main/java/org/apache/maven/cli/CLIManager.java | 2 +-
.../model/interpolation/ProblemDetectingValueSource.java | 1 -
10 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
index 0d0543e..257350c 100644
--- a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
+++ b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
@@ -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 );
}
diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/StringSource.java b/maven-builder-support/src/main/java/org/apache/maven/building/StringSource.java
index f9d87c0..7705804 100644
--- a/maven-builder-support/src/main/java/org/apache/maven/building/StringSource.java
+++ b/maven-builder-support/src/main/java/org/apache/maven/building/StringSource.java
@@ -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
diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
index 81ea92d..b0bbe66 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
@@ -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<>();
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 2ce3794..dbd6e8f 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -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() );
}
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
index 944cce6..3a72b98 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
@@ -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
{
diff --git a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
index 69f59fd..2803d8d 100644
--- a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
@@ -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 )
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java
index 1dc2b6b..a1a9532 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java
@@ -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<>();
diff --git a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
index 7a5e55d..5ac8f61 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
@@ -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()
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index ec5e1b1..c9e002a 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -107,7 +107,7 @@ public class CLIManager
protected Options options;
- @SuppressWarnings( { "static-access", "checkstyle:linelength" } )
+ @SuppressWarnings( "checkstyle:linelength" )
public CLIManager()
{
options = new Options();
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
index 4ed98d0..0b29f20 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
@@ -72,7 +72,6 @@ class ProblemDetectingValueSource
}
@Override
- @SuppressWarnings( "unchecked" )
public List getFeedback()
{
return valueSource.getFeedback();