Reformat

apache · Jan 31, 2023 · e9d5708 · e9d5708
1 parent 1a600c7
commit e9d5708
Show file tree

Hide file tree

Showing 574 changed files with 943 additions and 336 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
@@ -23,6 +23,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
+
 import junit.framework.TestCase;
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
 

diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
@@ -22,6 +22,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.regex.Pattern;
+
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;

diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
+
 import org.apache.commons.lang3.Validate;
 import org.apache.maven.artifact.versioning.VersionRange;
 

diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;

diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.repository;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;

diff --git a/...src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java b/...src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
@@ -20,6 +20,7 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;

diff --git a/...-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java b/...-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.resolver;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

diff --git a/...rtifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java b/...rtifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.resolver;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

diff --git a/.../src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java b/.../src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

diff --git a/...n-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java b/...n-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
@@ -18,10 +18,10 @@
  */
 package org.apache.maven.artifact.versioning;
 
-import static org.apache.commons.lang3.math.NumberUtils.isDigits;
-
 import java.util.StringTokenizer;
 
+import static org.apache.commons.lang3.math.NumberUtils.isDigits;
+
 /**
  * Default implementation of artifact versioning.
  *

diff --git a/...t/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java b/...t/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.versioning;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;

diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.WeakHashMap;
+
 import org.apache.maven.artifact.Artifact;
 
 /**

diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import junit.framework.TestCase;
 import org.apache.maven.artifact.versioning.VersionRange;
 

diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
@@ -18,9 +18,6 @@
  */
 package org.apache.maven.artifact.versioning;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -29,8 +26,12 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.regex.Pattern;
+
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 public class ComparableVersionIT {
 
     @Test

diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.versioning;
 
 import java.util.Locale;
+
 import junit.framework.TestCase;
 
 /**

diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.versioning;
 
 import java.util.List;
+
 import junit.framework.TestCase;
 import org.apache.maven.artifact.Artifact;
 

diff --git a/...-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java b/...-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
@@ -18,11 +18,11 @@
  */
 package org.apache.maven.building;
 
-import static org.junit.Assert.*;
-
 import org.apache.maven.building.Problem.Severity;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 public class DefaultProblemCollectorTest {
 
     @Test

diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
@@ -18,12 +18,12 @@
  */
 package org.apache.maven.building;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
 import org.apache.maven.building.Problem.Severity;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
 public class DefaultProblemTest {
 
     @Test

diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java
@@ -18,14 +18,15 @@
  */
 package org.apache.maven.building;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.io.InputStream;
 import java.util.Scanner;
+
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 public class FileSourceTest {
 
     @Test

diff --git a/...-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java b/...-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
@@ -18,12 +18,13 @@
  */
 package org.apache.maven.building;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-
 import java.util.Collections;
+
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
 public class ProblemCollectorFactoryTest {
 
     @Test

diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
@@ -18,12 +18,13 @@
  */
 package org.apache.maven.building;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.InputStream;
 import java.util.Scanner;
+
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class StringSourceTest {
     @Test
     public void testGetInputStream() throws Exception {

diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java
@@ -18,15 +18,16 @@
  */
 package org.apache.maven.building;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Scanner;
+
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 public class UrlSourceTest {
 
     @Test

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.deployer;
 
 import java.io.File;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java b/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.installer;
 
 import java.io.File;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java b/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.installer;
 
 import java.io.File;
+
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.manager;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.manager;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.wagon.ResourceDoesNotExistException;

diff --git a/...-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java b/...-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;

diff --git a/.../src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java b/.../src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
@@ -20,6 +20,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+
 import org.apache.maven.artifact.UnknownRepositoryLayoutException;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.plugin.LegacySupport;

diff --git a/.../java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/.../java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;

diff --git a/.../src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java b/.../src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
@@ -20,6 +20,7 @@
 
 import java.util.Iterator;
 import java.util.List;
+
 import org.apache.maven.artifact.repository.ArtifactRepository;
 
 /**

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.util.Collections;
 import java.util.Map;
+
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
@@ -20,6 +20,7 @@
 
 import java.util.List;
 import java.util.Set;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
@@ -21,6 +21,7 @@
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.codehaus.plexus.logging.Logger;

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -35,6 +35,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Matcher;
+
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.resolver;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
@@ -21,6 +21,7 @@
 import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.Set;
+
 import org.apache.maven.artifact.Artifact;
 
 /**

diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java b/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
@@ -21,6 +21,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+
 import org.apache.maven.artifact.Artifact;
 
 /**