This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit c84b9b3a0f4289cb14e70d96523743521654a698 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 08:04:56 2026 +0000 Simplify redundant code --- .../apache/maven/plugins/shade/DefaultShader.java | 7 ++-- .../maven/plugins/shade/ModuleInfoProcessor.java | 2 +- .../maven/plugins/shade/filter/SimpleFilter.java | 4 +-- .../maven/plugins/shade/mojo/ArtifactId.java | 16 ++++----- .../maven/plugins/shade/mojo/ArtifactSelector.java | 4 +-- .../apache/maven/plugins/shade/mojo/ShadeMojo.java | 4 +-- .../maven/plugins/shade/pom/MavenJDOMWriter.java | 40 +++++++++++----------- .../relocation/SerializedLambdaRelocator.java | 6 ++-- .../resource/ComponentsXmlResourceTransformer.java | 2 +- .../shade/resource/GroovyResourceTransformer.java | 6 ++-- .../resource/PluginXmlResourceTransformer.java | 4 +-- .../resource/properties/SortedProperties.java | 5 ++- .../maven/plugins/shade/DefaultShaderTest.java | 6 ++-- .../resource/ManifestResourceTransformerTest.java | 8 ++--- .../resource/SisuIndexResourceTransformerTest.java | 2 +- 15 files changed, 57 insertions(+), 59 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java index c7a8fb3..ec40800 100644 --- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java +++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java @@ -38,7 +38,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Collection; -import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; @@ -636,7 +635,7 @@ public class DefaultShader implements Shader { jarzS.add(jjar.getName()); } - Collections.sort(jarzS); // deterministic messages to be able to compare outputs (useful on CI) + jarzS.sort(null); // deterministic messages to be able to compare outputs (useful on CI) List<String> classes = new LinkedList<>(); List<String> resources = new LinkedList<>(); @@ -674,7 +673,7 @@ public class DefaultShader implements Shader { + String.join(" and ", overlaps) + ": "); // CHECKSTYLE_ON: LineLength - Collections.sort(all); + all.sort(null); int max = 10; @@ -923,7 +922,7 @@ public class DefaultShader implements Shader { /** * A package mapper based on a list of {@link Relocator}s. */ - private static class DefaultPackageMapper implements PackageMapper { + private static final class DefaultPackageMapper implements PackageMapper { private static final Pattern CLASS_PATTERN = Pattern.compile("(\\[*)?L(.+);"); private final List<Relocator> relocators; diff --git a/src/main/java/org/apache/maven/plugins/shade/ModuleInfoProcessor.java b/src/main/java/org/apache/maven/plugins/shade/ModuleInfoProcessor.java index 5d274c0..1c65194 100644 --- a/src/main/java/org/apache/maven/plugins/shade/ModuleInfoProcessor.java +++ b/src/main/java/org/apache/maven/plugins/shade/ModuleInfoProcessor.java @@ -1247,7 +1247,7 @@ final class ModuleInfoProcessor { logger.warn("Automatic-Module-Name has been set to keep the module name stable."); logger.warn("Reasons:"); List<FloorReason> reasons = new ArrayList<>(floorReasons); - Collections.sort(reasons); + reasons.sort(null); for (FloorReason reason : reasons) { logger.warn(" - " + reason.describe()); } diff --git a/src/main/java/org/apache/maven/plugins/shade/filter/SimpleFilter.java b/src/main/java/org/apache/maven/plugins/shade/filter/SimpleFilter.java index 7c2a1ac..7abe656 100644 --- a/src/main/java/org/apache/maven/plugins/shade/filter/SimpleFilter.java +++ b/src/main/java/org/apache/maven/plugins/shade/filter/SimpleFilter.java @@ -72,7 +72,7 @@ public class SimpleFilter implements Filter { final Set<String> includes, final Set<String> excludes, final boolean excludeDefaults) { - this.jars = (jars != null) ? Collections.<File>unmodifiableSet(jars) : Collections.<File>emptySet(); + this.jars = jars != null ? Collections.<File>unmodifiableSet(jars) : Collections.<File>emptySet(); this.includes = normalizePatterns(includes); this.excludes = normalizePatterns(excludes); this.excludeDefaults = excludeDefaults; @@ -138,7 +138,7 @@ public class SimpleFilter implements Filter { } private String normalizePath(String path) { - return (path != null) ? path.replace(File.separatorChar == '/' ? '\\' : '/', File.separatorChar) : null; + return path != null ? path.replace(File.separatorChar == '/' ? '\\' : '/', File.separatorChar) : null; } private Set<String> normalizePatterns(Set<String> patterns) { diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java index 3699c5b..032f2ec 100644 --- a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java +++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java @@ -44,10 +44,10 @@ class ArtifactId { } ArtifactId(String groupId, String artifactId, String type, String classifier) { - this.groupId = (groupId != null) ? groupId : ""; - this.artifactId = (artifactId != null) ? artifactId : ""; - this.type = (type != null) ? type : ""; - this.classifier = (classifier != null) ? classifier : ""; + this.groupId = groupId != null ? groupId : ""; + this.artifactId = artifactId != null ? artifactId : ""; + this.type = type != null ? type : ""; + this.classifier = classifier != null ? classifier : ""; } ArtifactId(String id) { @@ -55,10 +55,10 @@ class ArtifactId { if (id != null && id.length() > 0) { tokens = id.split(":", -1); } - groupId = (tokens.length > 0) ? tokens[0] : ""; - artifactId = (tokens.length > 1) ? tokens[1] : "*"; - type = (tokens.length > 3) ? tokens[2] : "*"; - classifier = (tokens.length > 3) ? tokens[3] : ((tokens.length > 2) ? tokens[2] : "*"); + groupId = tokens.length > 0 ? tokens[0] : ""; + artifactId = tokens.length > 1 ? tokens[1] : "*"; + type = tokens.length > 3 ? tokens[2] : "*"; + classifier = tokens.length > 3 ? tokens[3] : (tokens.length > 2 ? tokens[2] : "*"); } public String getGroupId() { diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java index 359f5b9..120114c 100644 --- a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java +++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java @@ -48,8 +48,8 @@ class ArtifactSelector { ArtifactSelector(Artifact projectArtifact, ArtifactSet artifactSet, String groupPrefix) { this( - (artifactSet != null) ? artifactSet.getIncludes() : null, - (artifactSet != null) ? artifactSet.getExcludes() : null, + artifactSet != null ? artifactSet.getIncludes() : null, + artifactSet != null ? artifactSet.getExcludes() : null, groupPrefix); if (projectArtifact != null && !this.includes.isEmpty()) { diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java index 707e354..840ad9b 100644 --- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java +++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java @@ -598,7 +598,7 @@ public class ShadeMojo extends AbstractMojo { getLog().info("No artifact matching artifactSet exclude " + pattern); } - File outputJar = (outputFile != null) ? outputFile : shadedArtifactFileWithClassifier(); + File outputJar = outputFile != null ? outputFile : shadedArtifactFileWithClassifier(); File sourcesJar = shadedSourceArtifactFileWithClassifier(); File testJar = shadedTestArtifactFileWithClassifier(); File testSourcesJar = shadedTestSourceArtifactFileWithClassifier(); @@ -1546,7 +1546,7 @@ public class ShadeMojo extends AbstractMojo { } private String getId(String groupId, String artifactId, String type, String classifier) { - return groupId + ":" + artifactId + ":" + type + ":" + ((classifier != null) ? classifier : ""); + return groupId + ":" + artifactId + ":" + type + ":" + (classifier != null ? classifier : ""); } /** diff --git a/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java b/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java index 9cac31e..1239928 100644 --- a/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java +++ b/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java @@ -175,7 +175,7 @@ public class MavenJDOMWriter { */ protected Element findAndReplaceSimpleLists( Counter counter, Element parent, Collection<String> list, String parentName, String childName) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentName, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -281,7 +281,7 @@ public class MavenJDOMWriter { */ protected void iterateContributor( Counter counter, Element parent, Collection<Contributor> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -324,7 +324,7 @@ public class MavenJDOMWriter { */ protected void iterateDependency( Counter counter, Element parent, Collection<Dependency> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -367,7 +367,7 @@ public class MavenJDOMWriter { */ protected void iterateDeveloper( Counter counter, Element parent, Collection<Developer> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -410,7 +410,7 @@ public class MavenJDOMWriter { */ protected void iterateExclusion( Counter counter, Element parent, Collection<Exclusion> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -453,7 +453,7 @@ public class MavenJDOMWriter { */ protected void iterateExtension( Counter counter, Element parent, Collection<Extension> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -496,7 +496,7 @@ public class MavenJDOMWriter { */ protected void iterateLicense( Counter counter, Element parent, Collection<License> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -539,7 +539,7 @@ public class MavenJDOMWriter { */ protected void iterateMailingList( Counter counter, Element parent, Collection<MailingList> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -582,7 +582,7 @@ public class MavenJDOMWriter { */ protected void iterateNotifier( Counter counter, Element parent, Collection<Notifier> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -625,7 +625,7 @@ public class MavenJDOMWriter { */ protected void iteratePlugin( Counter counter, Element parent, Collection<Plugin> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -668,7 +668,7 @@ public class MavenJDOMWriter { */ protected void iteratePluginExecution( Counter counter, Element parent, Collection<PluginExecution> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -711,7 +711,7 @@ public class MavenJDOMWriter { */ protected void iterateProfile( Counter counter, Element parent, Collection<Profile> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -754,7 +754,7 @@ public class MavenJDOMWriter { */ protected void iterateReportPlugin( Counter counter, Element parent, Collection<ReportPlugin> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -797,7 +797,7 @@ public class MavenJDOMWriter { */ protected void iterateReportSet( Counter counter, Element parent, Collection<ReportSet> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -840,7 +840,7 @@ public class MavenJDOMWriter { */ protected void iterateRepository( Counter counter, Element parent, Collection<Repository> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -883,7 +883,7 @@ public class MavenJDOMWriter { */ protected void iterateResource( Counter counter, Element parent, Collection<Resource> list, String parentTag, String childTag) { - boolean shouldExist = list != null && list.size() > 0; + boolean shouldExist = list != null && !list.isEmpty(); Element element = updateElement(counter, parent, parentTag, shouldExist); if (shouldExist) { Iterator<Element> elIt = @@ -1147,7 +1147,7 @@ public class MavenJDOMWriter { findAndReplaceSimpleElement(innerCount, root, "systemPath", value.getSystemPath(), null); iterateExclusion(innerCount, root, value.getExclusions(), "exclusions", "exclusion"); findAndReplaceSimpleElement( - innerCount, root, "optional", !value.isOptional() ? null : String.valueOf(value.isOptional()), "false"); + innerCount, root, "optional", value.isOptional() ? String.valueOf(value.isOptional()) : null, "false"); } /** @@ -1570,7 +1570,7 @@ public class MavenJDOMWriter { innerCount, root, "extensions", - !value.isExtensions() ? null : String.valueOf(value.isExtensions()), + value.isExtensions() ? String.valueOf(value.isExtensions()) : null, "false"); iteratePluginExecution(innerCount, root, value.getExecutions(), "executions", "execution"); iterateDependency(innerCount, root, value.getDependencies(), "dependencies", "dependency"); @@ -1765,7 +1765,7 @@ public class MavenJDOMWriter { innerCount, root, "excludeDefaults", - !value.isExcludeDefaults() ? null : String.valueOf(value.isExcludeDefaults()), + value.isExcludeDefaults() ? String.valueOf(value.isExcludeDefaults()) : null, "false"); findAndReplaceSimpleElement(innerCount, root, "outputDirectory", value.getOutputDirectory(), null); iterateReportPlugin(innerCount, root, value.getPlugins(), "plugins", "plugin"); @@ -1847,7 +1847,7 @@ public class MavenJDOMWriter { innerCount, root, "filtering", - !value.isFiltering() ? null : String.valueOf(value.isFiltering()), + value.isFiltering() ? String.valueOf(value.isFiltering()) : null, "false"); findAndReplaceSimpleElement(innerCount, root, "directory", value.getDirectory(), null); findAndReplaceSimpleLists(innerCount, root, value.getIncludes(), "includes", "include"); diff --git a/src/main/java/org/apache/maven/plugins/shade/relocation/SerializedLambdaRelocator.java b/src/main/java/org/apache/maven/plugins/shade/relocation/SerializedLambdaRelocator.java index b295667..e8a7075 100644 --- a/src/main/java/org/apache/maven/plugins/shade/relocation/SerializedLambdaRelocator.java +++ b/src/main/java/org/apache/maven/plugins/shade/relocation/SerializedLambdaRelocator.java @@ -55,9 +55,9 @@ public class SerializedLambdaRelocator extends SimpleRelocator { @Override public String relocatePath(String path) { - return !shouldRelocate - ? path - : clazzInsideFunctionDefintionPattern.matcher(path).replaceAll(shadedPathPattern); + return shouldRelocate + ? clazzInsideFunctionDefintionPattern.matcher(path).replaceAll(shadedPathPattern) + : path; } @Override diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java index ef507d0..a56956b 100644 --- a/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java +++ b/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java @@ -174,7 +174,7 @@ public class ComponentsXmlResourceTransformer extends AbstractCompatibilityTrans private static String getValue(Xpp3Dom dom, String element) { Xpp3Dom child = dom.getChild(element); - return (child != null && child.getValue() != null) ? child.getValue() : ""; + return child != null && child.getValue() != null ? child.getValue() : ""; } private static void setValue(Xpp3Dom dom, String element, String value) { diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java index 40c2018..9ee1c6e 100644 --- a/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java +++ b/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java @@ -85,7 +85,7 @@ public class GroovyResourceTransformer extends AbstractCompatibilityTransformer @Override public boolean hasTransformedResource() { - return extensionClassesList.size() > 0 || staticExtensionClassesList.size() > 0; + return !extensionClassesList.isEmpty() || !staticExtensionClassesList.isEmpty(); } @Override @@ -98,10 +98,10 @@ public class GroovyResourceTransformer extends AbstractCompatibilityTransformer Properties desc = new Properties(); desc.put("moduleName", extModuleName); desc.put("moduleVersion", extModuleVersion); - if (extensionClassesList.size() > 0) { + if (!extensionClassesList.isEmpty()) { desc.put("extensionClasses", join(extensionClassesList)); } - if (staticExtensionClassesList.size() > 0) { + if (!staticExtensionClassesList.isEmpty()) { desc.put("staticExtensionClasses", join(staticExtensionClassesList)); } desc.store(os, null); diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java index 2282b97..ec28c4f 100644 --- a/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java +++ b/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java @@ -172,7 +172,7 @@ public class PluginXmlResourceTransformer extends AbstractCompatibilityTransform private static String getValue(Xpp3Dom dom, String element) { Xpp3Dom child = dom.getChild(element); - return (child != null && child.getValue() != null) ? child.getValue() : ""; + return child != null && child.getValue() != null ? child.getValue() : ""; } private static void setValue(Xpp3Dom dom, String element, String value) { @@ -186,7 +186,7 @@ public class PluginXmlResourceTransformer extends AbstractCompatibilityTransform } private static String getAttribute(Xpp3Dom dom, String attribute) { - return (dom.getAttribute(attribute) != null) ? dom.getAttribute(attribute) : ""; + return dom.getAttribute(attribute) != null ? dom.getAttribute(attribute) : ""; } private static void setAttribute(Xpp3Dom dom, String attribute, String value) { diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java b/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java index 1e82736..cdd4ac9 100644 --- a/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java +++ b/src/main/java/org/apache/maven/plugins/shade/resource/properties/SortedProperties.java @@ -19,7 +19,6 @@ package org.apache.maven.plugins.shade.resource.properties; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.Enumeration; import java.util.Iterator; @@ -40,7 +39,7 @@ public class SortedProperties extends Properties { @Override public Set<Map.Entry<Object, Object>> entrySet() { final List<Map.Entry<Object, Object>> entries = new ArrayList<>(super.entrySet()); - Collections.sort(entries, new Comparator<Map.Entry<Object, Object>>() { + entries.sort(new Comparator<Map.Entry<Object, Object>>() { @Override public int compare(Map.Entry<Object, Object> o1, Map.Entry<Object, Object> o2) { return String.valueOf(o1.getKey()).compareTo(String.valueOf(o2.getKey())); @@ -56,7 +55,7 @@ public class SortedProperties extends Properties { for (Object k : super.keySet()) { keys.add((String) k); } - Collections.sort(keys); + keys.sort(null); final Iterator<String> it = keys.iterator(); return new Enumeration<Object>() { @Override diff --git a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java index 6a54ea3..73d8350 100644 --- a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java @@ -275,8 +275,8 @@ public class DefaultShaderTest { request.setJars(singleton(input)); request.setUberJar(shaded); request.setFilters(Collections.<Filter>emptyList()); - request.setRelocators(Collections.<Relocator>singletonList( - new SimpleRelocator("org.example", "org.shaded.example", null, null))); + request.setRelocators( + Collections.singletonList(new SimpleRelocator("org.example", "org.shaded.example", null, null))); request.setResourceTransformers(Collections.<ResourceTransformer>emptyList()); newShader().shade(request); @@ -377,7 +377,7 @@ public class DefaultShaderTest { } entries.add(jarEntry.getName()); } - Collections.sort(entries); + entries.sort(null); assertEquals( asList( "META-INF/maven/org.apache.maven.plugins.shade/test-artifact/pom.properties", diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformerTest.java b/src/test/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformerTest.java index da0e91f..fed1c36 100644 --- a/src/test/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformerTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformerTest.java @@ -92,7 +92,7 @@ public class ManifestResourceTransformerTest { public void rewriteDefaultAttributes() throws Exception { final Manifest manifest = createTestManifest(); - List<Relocator> relocators = Collections.<Relocator>singletonList(new SimpleRelocator( + List<Relocator> relocators = Collections.singletonList(new SimpleRelocator( "javax", "jakarta", Collections.<String>emptyList(), Collections.<String>emptyList())); final ByteArrayOutputStream out = transform(manifest, relocators); @@ -134,7 +134,7 @@ public class ManifestResourceTransformerTest { public void rewriteDefaultAttributesWithSameSuffix() throws Exception { final Manifest manifest = createTestManifest(); - List<Relocator> relocators = Collections.<Relocator>singletonList(new SimpleRelocator( + List<Relocator> relocators = Collections.singletonList(new SimpleRelocator( "javax", "shaded.javax", Collections.<String>emptyList(), Collections.<String>emptyList())); final ByteArrayOutputStream out = transform(manifest, relocators); @@ -163,7 +163,7 @@ public class ManifestResourceTransformerTest { attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0"); attributes.putValue("description-custom", "This jar uses javax packages"); - List<Relocator> relocators = Collections.<Relocator>singletonList(new SimpleRelocator( + List<Relocator> relocators = Collections.singletonList(new SimpleRelocator( "javax", "jakarta", Collections.<String>emptyList(), Collections.<String>emptyList())); transformer.setAdditionalAttributes(Arrays.asList("description-custom", "attribute-unknown")); @@ -199,7 +199,7 @@ public class ManifestResourceTransformerTest { attributes.putValue("Original-Entry", "PASSED"); transformer.setMainClass("org.apache.maven.Shade"); - transformer.setManifestEntries(Collections.<String, Object>singletonMap("Test-Entry", "PASSED")); + transformer.setManifestEntries(Collections.singletonMap("Test-Entry", "PASSED")); Attributes result = jarManifest(transform(manifest, Collections.<Relocator>emptyList())) .getMainAttributes(); diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/SisuIndexResourceTransformerTest.java b/src/test/java/org/apache/maven/plugins/shade/resource/SisuIndexResourceTransformerTest.java index 6f060ca..ba01b19 100644 --- a/src/test/java/org/apache/maven/plugins/shade/resource/SisuIndexResourceTransformerTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/resource/SisuIndexResourceTransformerTest.java @@ -56,7 +56,7 @@ public class SisuIndexResourceTransformerTest { */ @Test public void testIndexesAreMergedAndRelocated() throws IOException { - List<Relocator> relocators = Collections.<Relocator>singletonList(new SimpleRelocator( + List<Relocator> relocators = Collections.singletonList(new SimpleRelocator( "org.apache.one", "org.apache.two.org.apache.one", null, Collections.<String>emptyList())); process("org.apache.one.One", relocators);
