[MNG-7650] Reformat

apache · Dec 26, 2022 · 8150c62 · 8150c62
1 parent 67941c2
commit 8150c62
Show file tree

Hide file tree

Showing 822 changed files with 2,100 additions and 1,180 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
@@ -18,16 +18,17 @@
  */
 package org.apache.maven.settings;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
+
 import org.apache.maven.settings.v4.SettingsXpp3Reader;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * Tests that the global settings.xml shipped with the distribution is in good state.
  *

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/DependencyCoordinate.java b/api/maven-api-core/src/main/java/org/apache/maven/api/DependencyCoordinate.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.Collection;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Event.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Event.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.Optional;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/LocalRepository.java b/api/maven-api-core/src/main/java/org/apache/maven/api/LocalRepository.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.nio.file.Path;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/MojoExecution.java b/api/maven-api-core/src/main/java/org/apache/maven/api/MojoExecution.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.Optional;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.model.Plugin;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Node.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Node.java
@@ -22,6 +22,7 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Project.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Project.java
@@ -21,6 +21,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.model.Build;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/ResolutionScope.java b/api/maven-api-core/src/main/java/org/apache/maven/api/ResolutionScope.java
@@ -26,6 +26,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Scope.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Scope.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.Locale;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Optional;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.ThreadSafe;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/SessionData.java b/api/maven-api-core/src/main/java/org/apache/maven/api/SessionData.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.function.Supplier;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.Nullable;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Toolchain.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Toolchain.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.Map;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Component.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Component.java
@@ -24,6 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Execute.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Execute.java
@@ -24,6 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Mojo.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Mojo.java
@@ -24,6 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.apache.maven.api.ResolutionScope;
 import org.apache.maven.api.annotations.Experimental;
 

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Parameter.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Parameter.java
@@ -24,6 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

diff --git a/...pi-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactoryRequest.java b/...pi-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactoryRequest.java
@@ -18,15 +18,15 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * A request for creating a {@link ArtifactCoordinate} object.
  *

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployer.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployer.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.util.Collection;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.Service;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java
@@ -18,16 +18,17 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.util.Collection;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * A request for deploying one or more artifacts to a remote repository.
  *

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java
@@ -18,14 +18,14 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  *
  *

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstaller.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstaller.java
@@ -20,6 +20,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Session;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java
@@ -18,10 +18,9 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.util.Collection;
 import java.util.Collections;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
@@ -30,6 +29,8 @@
 import org.apache.maven.api.annotations.NotThreadSafe;
 import org.apache.maven.api.annotations.Nullable;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * A request for installing one or more artifacts in the local repository.
  *

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactManager.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactManager.java
@@ -20,6 +20,7 @@
 
 import java.nio.file.Path;
 import java.util.Optional;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.Service;
 import org.apache.maven.api.annotations.Experimental;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolver.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolver.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.util.Collection;
+
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Session;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java
@@ -18,16 +18,17 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.util.Collection;
+
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * A request for resolving an artifact.
  *

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverResult.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverResult.java
@@ -20,6 +20,7 @@
 
 import java.nio.file.Path;
 import java.util.Map;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;

diff --git a/...aven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java b/...aven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
@@ -18,13 +18,12 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.DependencyCoordinate;
 import org.apache.maven.api.Project;
@@ -35,6 +34,8 @@
 import org.apache.maven.api.annotations.NotThreadSafe;
 import org.apache.maven.api.annotations.Nullable;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * A request to collect the transitive dependencies and to build a dependency graph from them. There are three ways to
  * create a dependency graph. First, only the root dependency can be given. Second, a root dependency and direct

diff --git a/...maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorResult.java b/...maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorResult.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.util.List;
+
 import org.apache.maven.api.Node;
 import org.apache.maven.api.annotations.Experimental;
 

diff --git a/...-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactoryRequest.java b/...-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactoryRequest.java
@@ -18,11 +18,10 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Dependency;
 import org.apache.maven.api.Exclusion;
@@ -32,6 +31,8 @@
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  *
  * @since 4.0

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/LocalRepositoryManager.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/LocalRepositoryManager.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.nio.file.Path;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.LocalRepository;
 import org.apache.maven.api.RemoteRepository;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/Lookup.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/Lookup.java
@@ -20,6 +20,7 @@
 
 import java.util.List;
 import java.util.Map;
+
 import org.apache.maven.api.Service;
 
 public interface Lookup extends Service {

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilder.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilder.java
@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.nio.file.Path;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Service;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java
@@ -18,10 +18,9 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.nio.file.Path;
 import java.util.Optional;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Session;
@@ -31,6 +30,8 @@
 import org.apache.maven.api.annotations.NotThreadSafe;
 import org.apache.maven.api.annotations.Nullable;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * Request used to build a {@link org.apache.maven.api.Project} using
  * the {@link ProjectBuilder} service.

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java
@@ -21,6 +21,7 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Optional;
+
 import org.apache.maven.api.Project;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;

diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java
@@ -22,6 +22,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.Node;
 import org.apache.maven.api.Project;
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ @@
     package org.apache.maven.api;
     import java.util.Locale;
     import org.apache.maven.api.annotations.Experimental;
     /**
@@ Expand Down @@