[MNG-7601] Reformat sources

apache-maven/pom.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -100,6 +98,19 @@ under the License.
     </dependency>
   </dependencies>
 
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>apache.snapshots</id>
+      <url>https://repository.apache.org/snapshots/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
   <build>
     <finalName>${distributionFileName}</finalName>
     <pluginManagement>
@@ -179,10 +190,10 @@ under the License.
         <executions>
           <execution>
             <id>create-distro-packages</id>
-            <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <descriptors>
                 <descriptor>src/assembly/bin.xml</descriptor>
@@ -194,19 +205,6 @@ under the License.
     </plugins>
   </build>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <url>https://repository.apache.org/snapshots/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-
   <profiles>
     <profile>
       <id>create-distribution-in-dir</id>
@@ -222,10 +220,10 @@ under the License.
             <artifactId>maven-clean-plugin</artifactId>
             <executions>
               <execution>
+                <id>clean-target-dir</id>
                 <goals>
                   <goal>clean</goal>
                 </goals>
-                <id>clean-target-dir</id>
                 <phase>prepare-package</phase>
                 <configuration>
                   <excludeDefaultDirectories>true</excludeDefaultDirectories>
@@ -243,10 +241,10 @@ under the License.
             <executions>
               <execution>
                 <id>create-distribution-dir</id>
-                <phase>package</phase>
                 <goals>
                   <goal>single</goal>
                 </goals>
+                <phase>package</phase>
                 <configuration>
                   <finalName>./</finalName>
                   <appendAssemblyId>false</appendAssemblyId>
@@ -271,10 +269,10 @@ under the License.
             <executions>
               <execution>
                 <id>make-src-assembly</id>
-                <phase>package</phase>
                 <goals>
                   <goal>single</goal>
                 </goals>
+                <phase>package</phase>
                 <configuration>
                   <descriptors>
                     <descriptor>src/assembly/src.xml</descriptor>
@@ -288,14 +286,6 @@ under the License.
           <plugin>
             <groupId>net.nicoulaj.maven.plugins</groupId>
             <artifactId>checksum-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>source-release-checksum</id>
-                <goals>
-                  <goal>files</goal>
-                </goals>
-              </execution>
-            </executions>
             <configuration>
               <fileSets>
                 <fileSet>
@@ -310,6 +300,14 @@ under the License.
               </fileSets>
               <failIfNoFiles>true</failIfNoFiles>
             </configuration>
+            <executions>
+              <execution>
+                <id>source-release-checksum</id>
+                <goals>
+                  <goal>files</goal>
+                </goals>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>

apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.settings;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,39 +16,34 @@ package org.apache.maven.settings;
  * specific language governing permissions and limitations
  * under the License.
  */
+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.
  *
  * @author Benjamin Bentmann
  */
-public class GlobalSettingsTest
+public class GlobalSettingsTest {
-{
 
     @Test
-    public void testValidGlobalSettings()
+    public void testValidGlobalSettings() throws Exception {
-        throws Exception
+        String basedir = System.getProperty("basedir", System.getProperty("user.dir"));
-    {
-        String basedir = System.getProperty( "basedir", System.getProperty( "user.dir" ) );
 
-        File globalSettingsFile = new File( basedir, "src/assembly/maven/conf/settings.xml" );
+        File globalSettingsFile = new File(basedir, "src/assembly/maven/conf/settings.xml");
-        assertTrue( globalSettingsFile.isFile(), globalSettingsFile.getAbsolutePath() );
+        assertTrue(globalSettingsFile.isFile(), globalSettingsFile.getAbsolutePath());
 
-        try ( Reader reader = new InputStreamReader( new FileInputStream( globalSettingsFile ), StandardCharsets.UTF_8) )
+        try (Reader reader = new InputStreamReader(new FileInputStream(globalSettingsFile), StandardCharsets.UTF_8)) {
-        {
+            new SettingsXpp3Reader().read(reader);
-            new SettingsXpp3Reader().read( reader );
         }
     }
-
 }

api/maven-api-core/pom.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file

api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
@@ -30,8 +29,7 @@ import org.apache.maven.api.annotations.Nonnull;
  */
 @Experimental
 @Immutable
-public interface Artifact
+public interface Artifact {
-{
 
     /**
      * Returns a unique identifier for this artifact.
@@ -39,13 +37,15 @@ public interface Artifact
      *
      * @return the unique identifier
      */
-    default String key()
+    default String key() {
-    {
         return getGroupId()
-                + ':' + getArtifactId()
+                + ':'
-                + ':' + getExtension()
+                + getArtifactId()
-                + ( getClassifier().length() > 0 ? ":" + getClassifier() : "" )
+                + ':'
-                + ':' + getVersion();
+                + getExtension()
+                + (getClassifier().length() > 0 ? ":" + getClassifier() : "")
+                + ':'
+                + getVersion();
     }
 
     /**
@@ -104,5 +104,4 @@ public interface Artifact
      */
     @Nonnull
     ArtifactCoordinate toCoordinate();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/ArtifactCoordinate.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
@@ -31,8 +30,7 @@ import org.apache.maven.api.annotations.Nonnull;
  */
 @Experimental
 @Immutable
-public interface ArtifactCoordinate
+public interface ArtifactCoordinate {
-{
 
     /**
      * The groupId of the artifact.
@@ -77,13 +75,11 @@ public interface ArtifactCoordinate
     /**
      * Unique id identifying this artifact
      */
-    default String getId()
+    default String getId() {
-    {
         return getGroupId()
                 + ":" + getArtifactId()
                 + ":" + getExtension()
-                + ( getClassifier().isEmpty() ? "" : ":" + getClassifier() )
+                + (getClassifier().isEmpty() ? "" : ":" + getClassifier())
                 + ":" + getVersion();
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,11 +16,11 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Nonnull;
 
-public interface Dependency extends Artifact
+public interface Dependency extends Artifact {
-{
 
     /**
      * The artifact type.
@@ -44,5 +42,4 @@ public interface Dependency extends Artifact
      */
     @Nonnull
     DependencyCoordinate toCoordinate();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/DependencyCoordinate.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,13 +16,13 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.api;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
-import org.apache.maven.api.annotations.Nullable;
-import org.apache.maven.api.annotations.Immutable;
 
 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;
+import org.apache.maven.api.annotations.Nullable;
 
 /**
  *
@@ -32,8 +30,7 @@ import java.util.Collection;
  */
 @Experimental
 @Immutable
-public interface DependencyCoordinate extends ArtifactCoordinate
+public interface DependencyCoordinate extends ArtifactCoordinate {
-{
     /**
      * The type of the artifact.
      *
@@ -50,5 +47,4 @@ public interface DependencyCoordinate extends ArtifactCoordinate
 
     @Nonnull
     Collection<Exclusion> getExclusions();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/Event.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,11 +16,11 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.api;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
 
 import java.util.Optional;
+import org.apache.maven.api.annotations.Experimental;
+import org.apache.maven.api.annotations.Nonnull;
 
 /**
  * Event sent by maven during various phases of the build process.
@@ -32,8 +30,7 @@ import java.util.Optional;
  * @since 4.0
  */
 @Experimental
-public interface Event
+public interface Event {
-{
 
     /**
      * Gets the type of the event.
@@ -73,5 +70,4 @@ public interface Event
      * @return the exception or {@code empty()} if none
      */
     Optional<Exception> getException();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/EventType.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,8 +26,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public enum EventType
+public enum EventType {
-{
     PROJECT_DISCOVERY_STARTED,
     SESSION_STARTED,
     SESSION_ENDED,

api/maven-api-core/src/main/java/org/apache/maven/api/Exclusion.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nullable;
@@ -29,12 +28,10 @@ import org.apache.maven.api.annotations.Nullable;
  * @see DependencyCoordinate#getExclusions()
  */
 @Experimental
-public interface Exclusion
+public interface Exclusion {
-{
     @Nullable
     String getGroupId();
 
     @Nullable
     String getArtifactId();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/JavaToolchain.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,9 +26,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public interface JavaToolchain extends Toolchain
+public interface JavaToolchain extends Toolchain {
-{
 
     String getJavaHome();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/Listener.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Consumer;
 import org.apache.maven.api.annotations.Experimental;
@@ -30,8 +29,8 @@ import org.apache.maven.api.annotations.Nonnull;
  * @since 4.0
  */
 @Experimental
-@FunctionalInterface @Consumer
+@FunctionalInterface
-public interface Listener
+@Consumer
-{
+public interface Listener {
-    void onEvent( @Nonnull Event event );
+    void onEvent(@Nonnull Event event);
 }

api/maven-api-core/src/main/java/org/apache/maven/api/LocalRepository.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+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;
@@ -33,10 +31,8 @@ import org.apache.maven.api.annotations.Nonnull;
  */
 @Experimental
 @Immutable
-public interface LocalRepository extends Repository
+public interface LocalRepository extends Repository {
-{
 
     @Nonnull
     Path getPath();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,8 +26,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public enum MetadataStorage
+public enum MetadataStorage {
-{
     GROUP,
     ARTIFACT,
     VERSION

api/maven-api-core/src/main/java/org/apache/maven/api/MojoExecution.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,12 +16,11 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+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;
 import org.apache.maven.api.xml.Dom;
 
@@ -31,8 +28,7 @@ import org.apache.maven.api.xml.Dom;
  * A {@code MojoExecution}
  */
 @Experimental
-public interface MojoExecution
+public interface MojoExecution {
-{
     @Nonnull
     Plugin getPlugin();
 

api/maven-api-core/src/main/java/org/apache/maven/api/Node.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,15 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.api;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Immutable;
-import org.apache.maven.api.annotations.Nonnull;
 
 import java.util.List;
 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;
 
 /**
  * Represents a dependency node within a Maven project's dependency collector.
@@ -36,8 +34,7 @@ import java.util.stream.Stream;
  */
 @Experimental
 @Immutable
-public interface Node
+public interface Node {
-{
 
     /**
      * @return dependency for this node
@@ -70,7 +67,7 @@ public interface Node
      * @param visitor the visitor to call back, must not be {@code null}
      * @return {@code true} to visit siblings nodes of this node as well, {@code false} to skip siblings
      */
-    boolean accept( @Nonnull NodeVisitor visitor );
+    boolean accept(@Nonnull NodeVisitor visitor);
 
     /**
      * Returns a new tree starting at this node, filtering the children.
@@ -80,7 +77,7 @@ public interface Node
      * @param filter the filter to apply
      * @return a new filtered graph
      */
-    Node filter( Predicate<Node> filter );
+    Node filter(Predicate<Node> filter);
 
     /**
      * Returns a string representation of this dependency node.
@@ -95,9 +92,7 @@ public interface Node
      * @return a stream containing this node and its descendant
      */
     @Nonnull
-    default Stream<Node> stream()
+    default Stream<Node> stream() {
-    {
+        return Stream.concat(Stream.of(this), getChildren().stream().flatMap(Node::stream));
-        return Stream.concat( Stream.of( this ), getChildren().stream().flatMap( Node::stream ) );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/NodeVisitor.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,7 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Consumer;
 import org.apache.maven.api.annotations.Experimental;
@@ -31,8 +29,7 @@ import org.apache.maven.api.annotations.Nonnull;
  */
 @Experimental
 @Consumer
-public interface NodeVisitor
+public interface NodeVisitor {
-{
     /**
      * Starts the visit to the specified dependency node.
      *
@@ -40,7 +37,7 @@ public interface NodeVisitor
      * @return <code>true</code> to visit the specified dependency node's children, <code>false</code> to skip the
      *         specified dependency node's children and proceed to its next sibling
      */
-    boolean enter( @Nonnull Node node );
+    boolean enter(@Nonnull Node node);
 
     /**
      * Ends the visit to the specified dependency node.
@@ -49,5 +46,5 @@ public interface NodeVisitor
      * @return <code>true</code> to visit the specified dependency node's next sibling, <code>false</code> to skip the
      *         specified dependency node's next siblings and proceed to its parent
      */
-    boolean leave( @Nonnull Node node );
+    boolean leave(@Nonnull Node node);
 }

api/maven-api-core/src/main/java/org/apache/maven/api/Project.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,11 +16,11 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 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;
@@ -35,8 +33,7 @@ import org.apache.maven.api.model.Model;
  * @since 4.0
  */
 @Experimental
-public interface Project
+public interface Project {
-{
 
     @Nonnull
     String getGroupId();
@@ -57,8 +54,7 @@ public interface Project
     Model getModel();
 
     @Nonnull
-    default Build getBuild()
+    default Build getBuild() {
-    {
         Build build = getModel().getBuild();
         return build != null ? build : Build.newInstance();
     }
@@ -74,9 +70,8 @@ public interface Project
     Optional<Path> getPomPath();
 
     @Nonnull
-    default Optional<Path> getBasedir()
+    default Optional<Path> getBasedir() {
-    {
+        return getPomPath().map(Path::getParent);
-        return getPomPath().map( Path::getParent );
     }
 
     @Nonnull
@@ -86,8 +81,7 @@ public interface Project
     List<DependencyCoordinate> getManagedDependencies();
 
     @Nonnull
-    default String getId()
+    default String getId() {
-    {
         return getModel().getId();
     }
 
@@ -101,5 +95,4 @@ public interface Project
 
     @Nonnull
     List<RemoteRepository> getRemotePluginRepositories();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/RemoteRepository.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
@@ -28,13 +27,11 @@ import org.apache.maven.api.annotations.Nonnull;
  */
 @Experimental
 @Immutable
-public interface RemoteRepository extends Repository
+public interface RemoteRepository extends Repository {
-{
 
     @Nonnull
     String getUrl();
 
     @Nonnull
     String getProtocol();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/Repository.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
@@ -32,8 +31,7 @@ import org.apache.maven.api.annotations.Nonnull;
  */
 @Experimental
 @Immutable
-public interface Repository
+public interface Repository {
-{
 
     /**
      * Gets the identifier of this repository.
@@ -50,5 +48,4 @@ public interface Repository
      */
     @Nonnull
     String getType();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/ResolutionScope.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -27,7 +26,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.apache.maven.api.annotations.Experimental;
 
 /**
@@ -40,65 +38,59 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public enum ResolutionScope
+public enum ResolutionScope {
-{
     /**
      * empty resolution scope
      */
-    NONE( null ),
+    NONE(null),
     /**
      * <code>compile</code> resolution scope
      * = <code>compile</code> + <code>system</code> + <code>provided</code> dependencies
      */
-    COMPILE( "compile", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED ),
+    COMPILE("compile", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED),
     /**
      * <code>compile+runtime</code> resolution scope (Maven 3 only)
      * = <code>compile</code> + <code>system</code> + <code>provided</code> + <code>runtime</code> dependencies
      */
-    COMPILE_PLUS_RUNTIME( "compile+runtime", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED, Scope.RUNTIME ),
+    COMPILE_PLUS_RUNTIME("compile+runtime", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED, Scope.RUNTIME),
     /**
      * <code>runtime</code> resolution scope
      * = <code>compile</code> + <code>runtime</code> dependencies
      */
-    RUNTIME( "runtime", Scope.COMPILE, Scope.RUNTIME ),
+    RUNTIME("runtime", Scope.COMPILE, Scope.RUNTIME),
     /**
      * <code>runtime+system</code> resolution scope (Maven 3 only)
      * = <code>compile</code> + <code>system</code> + <code>runtime</code> dependencies
      */
-    RUNTIME_PLUS_SYSTEM( "runtime+system", Scope.COMPILE, Scope.SYSTEM, Scope.RUNTIME ),
+    RUNTIME_PLUS_SYSTEM("runtime+system", Scope.COMPILE, Scope.SYSTEM, Scope.RUNTIME),
     /**
      * <code>test</code> resolution scope
      * = <code>compile</code> + <code>system</code> + <code>provided</code> + <code>runtime</code> + <code>test</code>
      * dependencies
      */
-    TEST( "test", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED, Scope.RUNTIME, Scope.TEST );
+    TEST("test", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED, Scope.RUNTIME, Scope.TEST);
 
-    private static final Map<String, ResolutionScope> VALUES
+    private static final Map<String, ResolutionScope> VALUES =
-            = Stream.of( ResolutionScope.values() ).collect( Collectors.toMap( ResolutionScope::id, s -> s ) );
+            Stream.of(ResolutionScope.values()).collect(Collectors.toMap(ResolutionScope::id, s -> s));
 
-    public static ResolutionScope fromString( String id )
+    public static ResolutionScope fromString(String id) {
-    {
+        return Optional.ofNullable(VALUES.get(id))
-        return Optional.ofNullable( VALUES.get( id ) )
+                .orElseThrow(() -> new IllegalArgumentException("Unknown resolution scope " + id));
-                .orElseThrow( () -> new IllegalArgumentException( "Unknown resolution scope " + id ) );
     }
 
     private final String id;
     private final Set<Scope> scopes;
 
-    ResolutionScope( String id, Scope... scopes )
+    ResolutionScope(String id, Scope... scopes) {
-    {
         this.id = id;
-        this.scopes = Collections.unmodifiableSet( new HashSet<>( Arrays.asList( scopes ) ) );
+        this.scopes = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(scopes)));
     }
 
-    public String id()
+    public String id() {
-    {
         return this.id;
     }
 
-    public Set<Scope> scopes()
+    public Set<Scope> scopes() {
-    {
         return scopes;
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/Scope.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import java.util.Locale;
-
 import org.apache.maven.api.annotations.Experimental;
 
 /**
@@ -29,29 +27,25 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public enum Scope
+public enum Scope {
-{
+    COMPILE("compile"),
-    COMPILE( "compile" ),
+    PROVIDED("provided"),
-    PROVIDED ( "provided" ),
+    SYSTEM("system"),
-    SYSTEM( "system" ),
+    RUNTIME("runtime"),
-    RUNTIME( "runtime" ),
+    TEST("test"),
-    TEST( "test" ),
+    IMPORT("import");
-    IMPORT( "import" );
 
     private final String id;
 
-    Scope( String id )
+    Scope(String id) {
-    {
         this.id = id;
     }
 
-    public String id()
+    public String id() {
-    {
         return this.id;
     }
 
-    public static Scope get( String scope )
+    public static Scope get(String scope) {
-    {
+        return Enum.valueOf(Scope.class, scope.toUpperCase(Locale.ROOT));
-        return Enum.valueOf( Scope.class, scope.toUpperCase( Locale.ROOT ) );
     }
 }

api/maven-api-core/src/main/java/org/apache/maven/api/Service.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.ThreadSafe;
@@ -32,6 +31,4 @@ import org.apache.maven.api.annotations.ThreadSafe;
  */
 @Experimental
 @ThreadSafe
-public interface Service
+public interface Service {}
-{
-}

api/maven-api-core/src/main/java/org/apache/maven/api/Session.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import java.nio.file.Path;
 import java.time.Instant;
@@ -26,7 +25,6 @@ import java.util.List;
 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;
@@ -41,8 +39,7 @@ import org.apache.maven.api.settings.Settings;
  */
 @Experimental
 @ThreadSafe
-public interface Session
+public interface Session {
-{
 
     @Nonnull
     Settings getSettings();
@@ -105,7 +102,7 @@ public interface Session
      * @throws org.apache.maven.api.services.MavenException if not called from the within a mojo execution
      */
     @Nonnull
-    Map<String, Object> getPluginContext( @Nonnull Project project );
+    Map<String, Object> getPluginContext(@Nonnull Project project);
 
     /**
      * Retrieves the service for the interface
@@ -113,7 +110,7 @@ public interface Session
      * @throws NoSuchElementException if the service could not be found
      */
     @Nonnull
-    <T extends Service> T getService( @Nonnull Class<T> clazz );
+    <T extends Service> T getService(@Nonnull Class<T> clazz);
 
     /**
      * Creates a derived session using the given local repository.
@@ -123,7 +120,7 @@ public interface Session
      * @throws NullPointerException if {@code localRepository} is null
      */
     @Nonnull
-    Session withLocalRepository( @Nonnull LocalRepository localRepository );
+    Session withLocalRepository(@Nonnull LocalRepository localRepository);
 
     /**
      * Creates a derived session using the given remote repositories.
@@ -133,7 +130,7 @@ public interface Session
      * @throws NullPointerException if {@code repositories} is null
      */
     @Nonnull
-    Session withRemoteRepositories( @Nonnull List<RemoteRepository> repositories );
+    Session withRemoteRepositories(@Nonnull List<RemoteRepository> repositories);
 
     /**
      * Register the given listener which will receive all events.
@@ -141,7 +138,7 @@ public interface Session
      * @param listener the listener to register
      * @throws NullPointerException if {@code listener} is null
      */
-    void registerListener( @Nonnull Listener listener );
+    void registerListener(@Nonnull Listener listener);
 
     /**
      * Unregisters a previously registered listener.
@@ -149,7 +146,7 @@ public interface Session
      * @param listener the listener to unregister
      * @throws NullPointerException if {@code listener} is null
      */
-    void unregisterListener( @Nonnull Listener listener );
+    void unregisterListener(@Nonnull Listener listener);
 
     /**
      * Returns the list of registered listeners.
@@ -163,60 +160,60 @@ public interface Session
      * Shortcut for <code>getService(RepositoryFactory.class).createLocal(...)</code>
      * @see org.apache.maven.api.services.RepositoryFactory#createLocal(Path)
      */
-    LocalRepository createLocalRepository( Path path );
+    LocalRepository createLocalRepository(Path path);
 
     /**
      * Shortcut for <code>getService(RepositoryFactory.class).createRemote(...)</code>
      * @see org.apache.maven.api.services.RepositoryFactory#createRemote(String, String)
      */
     @Nonnull
-    RemoteRepository createRemoteRepository( @Nonnull String id, @Nonnull String url );
+    RemoteRepository createRemoteRepository(@Nonnull String id, @Nonnull String url);
 
     /**
      * Shortcut for <code>getService(RepositoryFactory.class).createRemote(...)</code>
      * @see org.apache.maven.api.services.RepositoryFactory#createRemote(Repository)
      */
     @Nonnull
-    RemoteRepository createRemoteRepository( @Nonnull Repository repository );
+    RemoteRepository createRemoteRepository(@Nonnull Repository repository);
 
     /**
      * Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
      * @see org.apache.maven.api.services.ArtifactFactory#create(Session, String, String, String, String)
      */
-    ArtifactCoordinate createArtifactCoordinate( String groupId, String artifactId, String version, String extension );
+    ArtifactCoordinate createArtifactCoordinate(String groupId, String artifactId, String version, String extension);
 
     /**
      * Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
      * @see org.apache.maven.api.services.ArtifactFactory#create(Session, String, String, String, String, String, String)
      */
-    ArtifactCoordinate createArtifactCoordinate( String groupId, String artifactId, String version, String classifier,
+    ArtifactCoordinate createArtifactCoordinate(
-                                                 String extension, String type );
+            String groupId, String artifactId, String version, String classifier, String extension, String type);
 
     /**
      * Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
      * @see org.apache.maven.api.services.ArtifactFactory#create(Session, String, String, String, String, String, String)
      */
-    ArtifactCoordinate createArtifactCoordinate( Artifact artifact );
+    ArtifactCoordinate createArtifactCoordinate(Artifact artifact);
 
     /**
      * Shortcut for <code>getService(DependencyFactory.class).create(...)</code>
      * @see DependencyCoordinateFactory#create(Session, ArtifactCoordinate)
      */
     @Nonnull
-    DependencyCoordinate createDependencyCoordinate( @Nonnull ArtifactCoordinate coordinate );
+    DependencyCoordinate createDependencyCoordinate(@Nonnull ArtifactCoordinate coordinate);
 
     /**
      * Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
      * @see org.apache.maven.api.services.ArtifactFactory#create(Session, String, String, String, String)
      */
-    Artifact createArtifact( String groupId, String artifactId, String version, String extension );
+    Artifact createArtifact(String groupId, String artifactId, String version, String extension);
 
     /**
      * Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
      * @see org.apache.maven.api.services.ArtifactFactory#create(Session, String, String, String, String, String, String)
      */
-    Artifact createArtifact( String groupId, String artifactId, String version, String classifier,
+    Artifact createArtifact(
-                             String extension, String type );
+            String groupId, String artifactId, String version, String classifier, String extension, String type);
 
     /**
      * Shortcut for <code>getService(ArtifactResolver.class).resolve(...)</code>
@@ -224,7 +221,7 @@ public interface Session
      *
      * @throws org.apache.maven.api.services.ArtifactResolverException if the artifact resolution failed
      */
-    Artifact resolveArtifact( ArtifactCoordinate coordinate );
+    Artifact resolveArtifact(ArtifactCoordinate coordinate);
 
     /**
      * Shortcut for <code>getService(ArtifactResolver.class).resolve(...)</code>
@@ -232,7 +229,7 @@ public interface Session
      *
      * @throws org.apache.maven.api.services.ArtifactResolverException if the artifact resolution failed
      */
-    Collection<Artifact> resolveArtifacts( ArtifactCoordinate... coordinates );
+    Collection<Artifact> resolveArtifacts(ArtifactCoordinate... coordinates);
 
     /**
      * Shortcut for <code>getService(ArtifactResolver.class).resolve(...)</code>
@@ -240,7 +237,7 @@ public interface Session
      *
      * @throws org.apache.maven.api.services.ArtifactResolverException if the artifact resolution failed
      */
-    Collection<Artifact> resolveArtifacts( Collection<? extends ArtifactCoordinate> coordinates );
+    Collection<Artifact> resolveArtifacts(Collection<? extends ArtifactCoordinate> coordinates);
 
     /**
      * Shortcut for <code>getService(ArtifactResolver.class).resolve(...)</code>
@@ -248,7 +245,7 @@ public interface Session
      *
      * @throws org.apache.maven.api.services.ArtifactResolverException if the artifact resolution failed
      */
-    Artifact resolveArtifact( Artifact artifact );
+    Artifact resolveArtifact(Artifact artifact);
 
     /**
      * Shortcut for <code>getService(ArtifactResolver.class).resolve(...)</code>
@@ -256,7 +253,7 @@ public interface Session
      *
      * @throws org.apache.maven.api.services.ArtifactResolverException if the artifact resolution failed
      */
-    Collection<Artifact> resolveArtifacts( Artifact... artifacts );
+    Collection<Artifact> resolveArtifacts(Artifact... artifacts);
 
     /**
      * Shortcut for {@code getService(ArtifactInstaller.class).install(...)}
@@ -264,7 +261,7 @@ public interface Session
      *
      * @throws org.apache.maven.api.services.ArtifactInstallerException if the artifacts installation failed
      */
-    void installArtifacts( Artifact... artifacts );
+    void installArtifacts(Artifact... artifacts);
 
     /**
      * Shortcut for {@code getService(ArtifactInstaller.class).install(...)}
@@ -272,7 +269,7 @@ public interface Session
      *
      * @throws org.apache.maven.api.services.ArtifactInstallerException if the artifacts installation failed
      */
-    void installArtifacts( Collection<Artifact> artifacts );
+    void installArtifacts(Collection<Artifact> artifacts);
 
     /**
      * Shortcut for <code>getService(ArtifactDeployer.class).deploy(...)</code>
@@ -280,26 +277,26 @@ public interface Session
      *
      * @throws org.apache.maven.api.services.ArtifactDeployerException if the artifacts deployment failed
      */
-    void deployArtifact( RemoteRepository repository, Artifact... artifacts );
+    void deployArtifact(RemoteRepository repository, Artifact... artifacts);
 
     /**
      * Shortcut for <code>getService(ArtifactManager.class).setPath(...)</code>
      * @see org.apache.maven.api.services.ArtifactManager#setPath(Artifact, Path)
      */
-    void setArtifactPath( @Nonnull Artifact artifact, @Nonnull Path path );
+    void setArtifactPath(@Nonnull Artifact artifact, @Nonnull Path path);
 
     /**
      * Shortcut for <code>getService(ArtifactManager.class).getPath(...)</code>
      * @see org.apache.maven.api.services.ArtifactManager#getPath(Artifact)
      */
     @Nonnull
-    Optional<Path> getArtifactPath( @Nonnull Artifact artifact );
+    Optional<Path> getArtifactPath(@Nonnull Artifact artifact);
 
     /**
      * Shortcut for <code>getService(ArtifactManager.class).isSnapshot(...)</code>
      * @see org.apache.maven.api.services.VersionParser#isSnapshot(String)
      */
-    boolean isVersionSnapshot( @Nonnull String version );
+    boolean isVersionSnapshot(@Nonnull String version);
 
     /**
      * Shortcut for <code>getService(DependencyCollector.class).collect(...)</code>
@@ -308,7 +305,7 @@ public interface Session
      * @throws org.apache.maven.api.services.DependencyCollectorException if the dependency collection failed
      */
     @Nonnull
-    Node collectDependencies( @Nonnull Artifact artifact );
+    Node collectDependencies(@Nonnull Artifact artifact);
 
     /**
      * Shortcut for <code>getService(DependencyCollector.class).collect(...)</code>
@@ -317,7 +314,7 @@ public interface Session
      * @throws org.apache.maven.api.services.DependencyCollectorException if the dependency collection failed
      */
     @Nonnull
-    Node collectDependencies( @Nonnull Project project );
+    Node collectDependencies(@Nonnull Project project);
 
     /**
      * Shortcut for <code>getService(DependencyResolver.class).resolve(...)</code>
@@ -326,11 +323,11 @@ public interface Session
      * @throws org.apache.maven.api.services.DependencyCollectorException if the dependency collection failed
      */
     @Nonnull
-    Node collectDependencies( @Nonnull DependencyCoordinate dependency );
+    Node collectDependencies(@Nonnull DependencyCoordinate dependency);
 
-    Path getPathForLocalArtifact( @Nonnull Artifact artifact );
+    Path getPathForLocalArtifact(@Nonnull Artifact artifact);
 
-    Path getPathForRemoteArtifact( RemoteRepository remote, Artifact artifact );
+    Path getPathForRemoteArtifact(RemoteRepository remote, Artifact artifact);
 
     /**
      * Shortcut for <code>getService(VersionParser.class).parseVersion(...)</code>
@@ -339,7 +336,7 @@ public interface Session
      * @throws org.apache.maven.api.services.VersionParserException if the parsing failed
      */
     @Nonnull
-    Version parseVersion( @Nonnull String version );
+    Version parseVersion(@Nonnull String version);
 
     /**
      * Shortcut for <code>getService(VersionParser.class).parseVersionRange(...)</code>
@@ -348,5 +345,5 @@ public interface Session
      * @throws org.apache.maven.api.services.VersionParserException if the parsing failed
      */
     @Nonnull
-    VersionRange parseVersionRange( @Nonnull String versionRange );
+    VersionRange parseVersionRange(@Nonnull String versionRange);
 }

api/maven-api-core/src/main/java/org/apache/maven/api/SessionData.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,15 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+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;
 import org.apache.maven.api.annotations.Provider;
 import org.apache.maven.api.annotations.ThreadSafe;
 
-import java.util.function.Supplier;
-
 /**
  * A container for data that is specific to a session.
  * All components may use this storage to associate arbitrary data with a session.
@@ -40,9 +38,9 @@ import java.util.function.Supplier;
  * @since 4.0
  */
 @Experimental
-@ThreadSafe @Provider
+@ThreadSafe
-public interface SessionData
+@Provider
-{
+public interface SessionData {
 
     /**
      * Associates the specified session data with the given key.
@@ -50,7 +48,7 @@ public interface SessionData
      * @param key the key under which to store the session data, must not be {@code null}
      * @param value the data to associate with the key, may be {@code null} to remove the mapping
      */
-    void set( @Nonnull Object key, @Nullable Object value );
+    void set(@Nonnull Object key, @Nullable Object value);
 
     /**
      * Associates the specified session data with the given key if the key is currently mapped to the given value. This
@@ -62,7 +60,7 @@ public interface SessionData
      * @return {@code true} if the key mapping was successfully updated from the old value to the new value,
      *         {@code false} if the current key mapping didn't match the expected value and was not updated.
      */
-    boolean set( @Nonnull Object key, @Nullable Object oldValue, @Nullable Object newValue );
+    boolean set(@Nonnull Object key, @Nullable Object oldValue, @Nullable Object newValue);
 
     /**
      * Gets the session data associated with the specified key.
@@ -71,7 +69,7 @@ public interface SessionData
      * @return the session data associated with the key or {@code null} if none
      */
     @Nullable
-    Object get( @Nonnull Object key );
+    Object get(@Nonnull Object key);
 
     /**
      * Retrieve of compute the data associated with the specified key.
@@ -81,6 +79,5 @@ public interface SessionData
      * @return the session data associated with the key
      */
     @Nullable
-    Object computeIfAbsent( @Nonnull Object key, @Nonnull Supplier<Object> supplier );
+    Object computeIfAbsent(@Nonnull Object key, @Nonnull Supplier<Object> supplier);
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/Toolchain.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import java.util.Map;
-
 import org.apache.maven.api.annotations.Experimental;
 
 /**
@@ -29,8 +27,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public interface Toolchain
+public interface Toolchain {
-{
     /**
      * get the type of toolchain.
      *
@@ -44,7 +41,7 @@ public interface Toolchain
      * @param toolName the tool platform independent tool name
      * @return file representing the tool executable, or null if the tool cannot be found
      */
-    String findTool( String toolName );
+    String findTool(String toolName);
 
     /**
      * Let the toolchain decide if it matches requirements defined
@@ -52,5 +49,5 @@ public interface Toolchain
      * @param requirements Map<String, String> key value pair, may not be {@code null}
      * @return {@code true} if the requirements match, otherwise {@code false}
      */
-    boolean matchesRequirements( Map<String, String> requirements );
+    boolean matchesRequirements(Map<String, String> requirements);
 }

api/maven-api-core/src/main/java/org/apache/maven/api/Type.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
@@ -34,8 +33,7 @@ import org.apache.maven.api.annotations.Immutable;
  */
 @Experimental
 @Immutable
-public interface Type
+public interface Type {
-{
 
     String POM = "pom";
     String JAR = "jar";
@@ -68,5 +66,4 @@ public interface Type
     boolean isIncludesDependencies();
 
     boolean isAddedToClasspath();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/Version.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
@@ -30,9 +29,7 @@ import org.apache.maven.api.annotations.Nonnull;
  * @see org.apache.maven.api.Session#parseVersion(String)
  */
 @Experimental
-public interface Version
+public interface Version extends Comparable<Version> {
-    extends Comparable<Version>
-{
 
     // TODO: add access to the version information
 
@@ -42,5 +39,4 @@ public interface Version
      */
     @Nonnull
     String asString();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/VersionRange.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
@@ -28,8 +27,7 @@ import org.apache.maven.api.annotations.Nonnull;
  * @since 4.0
  */
 @Experimental
-public interface VersionRange
+public interface VersionRange {
-{
 
     // TODO: add access to the version information
 
@@ -39,7 +37,7 @@ public interface VersionRange
      * @param version the version to test, must not be {@code null}
      * @return {@code true} if this range contains the specified version, {@code false} otherwise
      */
-    boolean contains( @Nonnull Version version );
+    boolean contains(@Nonnull Version version);
 
     /**
      * Returns a string representation of this version range

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/Log.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.plugin;
 
 import java.util.function.Supplier;
 
@@ -31,8 +30,7 @@ import java.util.function.Supplier;
  *
  * @since 4.0
  */
-public interface Log
+public interface Log {
-{
     /**
      * @return true if the <b>debug</b> error level is enabled
      */
@@ -43,7 +41,7 @@ public interface Log
      *
      * @param content
      */
-    void debug( CharSequence content );
+    void debug(CharSequence content);
 
     /**
      * Send a message (and accompanying exception) to the user in the <b>debug</b> error level.<br>
@@ -52,7 +50,7 @@ public interface Log
      * @param content
      * @param error
      */
-    void debug( CharSequence content, Throwable error );
+    void debug(CharSequence content, Throwable error);
 
     /**
      * Send an exception to the user in the <b>debug</b> error level.<br>
@@ -60,11 +58,11 @@ public interface Log
      *
      * @param error
      */
-    void debug( Throwable error );
+    void debug(Throwable error);
 
-    void debug( Supplier<String> content );
+    void debug(Supplier<String> content);
 
-    void debug( Supplier<String> content, Throwable error );
+    void debug(Supplier<String> content, Throwable error);
 
     /**
      * @return true if the <b>info</b> error level is enabled
@@ -76,7 +74,7 @@ public interface Log
      *
      * @param content
      */
-    void info( CharSequence content );
+    void info(CharSequence content);
 
     /**
      * Send a message (and accompanying exception) to the user in the <b>info</b> error level.<br>
@@ -85,7 +83,7 @@ public interface Log
      * @param content
      * @param error
      */
-    void info( CharSequence content, Throwable error );
+    void info(CharSequence content, Throwable error);
 
     /**
      * Send an exception to the user in the <b>info</b> error level.<br>
@@ -93,11 +91,11 @@ public interface Log
      *
      * @param error
      */
-    void info( Throwable error );
+    void info(Throwable error);
 
-    void info( Supplier<String> content );
+    void info(Supplier<String> content);
 
-    void info( Supplier<String> content, Throwable error );
+    void info(Supplier<String> content, Throwable error);
 
     /**
      * @return true if the <b>warn</b> error level is enabled
@@ -109,7 +107,7 @@ public interface Log
      *
      * @param content
      */
-    void warn( CharSequence content );
+    void warn(CharSequence content);
 
     /**
      * Send a message (and accompanying exception) to the user in the <b>warn</b> error level.<br>
@@ -118,7 +116,7 @@ public interface Log
      * @param content
      * @param error
      */
-    void warn( CharSequence content, Throwable error );
+    void warn(CharSequence content, Throwable error);
 
     /**
      * Send an exception to the user in the <b>warn</b> error level.<br>
@@ -126,11 +124,11 @@ public interface Log
      *
      * @param error
      */
-    void warn( Throwable error );
+    void warn(Throwable error);
 
-    void warn( Supplier<String> content );
+    void warn(Supplier<String> content);
 
-    void warn( Supplier<String> content, Throwable error );
+    void warn(Supplier<String> content, Throwable error);
 
     /**
      * @return true if the <b>error</b> error level is enabled
@@ -142,7 +140,7 @@ public interface Log
      *
      * @param content
      */
-    void error( CharSequence content );
+    void error(CharSequence content);
 
     /**
      * Send a message (and accompanying exception) to the user in the <b>error</b> error level.<br>
@@ -151,7 +149,7 @@ public interface Log
      * @param content
      * @param error
      */
-    void error( CharSequence content, Throwable error );
+    void error(CharSequence content, Throwable error);
 
     /**
      * Send an exception to the user in the <b>error</b> error level.<br>
@@ -159,10 +157,9 @@ public interface Log
      *
      * @param error
      */
-    void error( Throwable error );
+    void error(Throwable error);
 
-    void error( Supplier<String> content );
+    void error(Supplier<String> content);
-
-    void error( Supplier<String> content, Throwable error );
 
+    void error(Supplier<String> content, Throwable error);
 }

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/Mojo.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.plugin;
 
 import org.apache.maven.api.annotations.Consumer;
 import org.apache.maven.api.annotations.Experimental;
@@ -31,9 +30,9 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-@FunctionalInterface @Consumer
+@FunctionalInterface
-public interface Mojo
+@Consumer
-{
+public interface Mojo {
     /**
      * Perform whatever build-process behavior this <code>Mojo</code> implements.<br>
      * This is the main trigger for the <code>Mojo</code> inside the <code>Maven</code> system, and allows
@@ -42,5 +41,4 @@ public interface Mojo
      * @throws MojoException if a problem occurs
      */
     void execute();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/MojoException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.plugin;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.services.MavenException;
@@ -28,9 +27,7 @@ import org.apache.maven.api.services.MavenException;
  * @since 4.0
  */
 @Experimental
-public class MojoException
+public class MojoException extends MavenException {
-    extends MavenException
-{
 
     protected Object source;
 
@@ -40,9 +37,8 @@ public class MojoException
      * Construct a new <code>MojoException</code> exception providing the source and a short and long message:
      * these messages are used to improve the message written at the end of Maven build.
      */
-    public MojoException( Object source, String shortMessage, String longMessage )
+    public MojoException(Object source, String shortMessage, String longMessage) {
-    {
+        super(shortMessage);
-        super( shortMessage );
         this.source = source;
         this.longMessage = longMessage;
     }
@@ -51,17 +47,15 @@ public class MojoException
      * Construct a new <code>MojoExecutionException</code> exception wrapping an underlying <code>Throwable</code>
      * and providing a <code>message</code>.
      */
-    public MojoException( String message, Throwable cause )
+    public MojoException(String message, Throwable cause) {
-    {
+        super(message, cause);
-        super( message, cause );
     }
 
     /**
      * Construct a new <code>MojoExecutionException</code> exception providing a <code>message</code>.
      */
-    public MojoException( String message )
+    public MojoException(String message) {
-    {
+        super(message);
-        super( message );
     }
 
     /**
@@ -70,19 +64,15 @@ public class MojoException
      * @param cause the cause which is saved for later retrieval by the {@link #getCause()} method.
      *              A {@code null} value is permitted, and indicates that the cause is nonexistent or unknown.
      */
-    public MojoException( Throwable cause )
+    public MojoException(Throwable cause) {
-    {
+        super(cause);
-        super( cause );
     }
 
-    public String getLongMessage()
+    public String getLongMessage() {
-    {
         return longMessage;
     }
 
-    public Object getSource()
+    public Object getSource() {
-    {
         return source;
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Component.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.plugin.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -25,7 +24,6 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.apache.maven.api.annotations.Experimental;
 
 /**
@@ -37,11 +35,10 @@ import org.apache.maven.api.annotations.Experimental;
  */
 @Experimental
 @Documented
-@Retention( RetentionPolicy.CLASS )
+@Retention(RetentionPolicy.CLASS)
-@Target( { ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER } )
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
 @Inherited
-public @interface Component
+public @interface Component {
-{
     /**
      * role of the component to inject.
      * @return the role

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Execute.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.plugin.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -25,7 +24,6 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.apache.maven.api.annotations.Experimental;
 
 /**
@@ -35,11 +33,10 @@ import org.apache.maven.api.annotations.Experimental;
  */
 @Experimental
 @Documented
-@Retention( RetentionPolicy.CLASS )
+@Retention(RetentionPolicy.CLASS)
-@Target( ElementType.TYPE )
+@Target(ElementType.TYPE)
 @Inherited
-public @interface Execute
+public @interface Execute {
-{
     /**
      * Lifecycle phase to fork. Note that specifying a phase overrides specifying a goal.
      * For custom lifecycle phase ids use {@link #customPhase()} instead.

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/InstantiationStrategy.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.plugin.annotations;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,22 +26,19 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public enum InstantiationStrategy
+public enum InstantiationStrategy {
-{
+    PER_LOOKUP("per-lookup"),
-    PER_LOOKUP( "per-lookup" ),
+    SINGLETON("singleton"),
-    SINGLETON( "singleton" ),
+    KEEP_ALIVE("keep-alive"),
-    KEEP_ALIVE( "keep-alive" ),
+    POOLABLE("poolable");
-    POOLABLE( "poolable" );
 
     private final String id;
 
-    InstantiationStrategy( String id )
+    InstantiationStrategy(String id) {
-    {
         this.id = id;
     }
 
-    public String id()
+    public String id() {
-    {
         return this.id;
     }
 }

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/LifecyclePhase.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.plugin.annotations;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,54 +26,49 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public enum LifecyclePhase
+public enum LifecyclePhase {
-{
+    VALIDATE("validate"),
+    INITIALIZE("initialize"),
+    GENERATE_SOURCES("generate-sources"),
+    PROCESS_SOURCES("process-sources"),
+    GENERATE_RESOURCES("generate-resources"),
+    PROCESS_RESOURCES("process-resources"),
+    COMPILE("compile"),
+    PROCESS_CLASSES("process-classes"),
+    GENERATE_TEST_SOURCES("generate-test-sources"),
+    PROCESS_TEST_SOURCES("process-test-sources"),
+    GENERATE_TEST_RESOURCES("generate-test-resources"),
+    PROCESS_TEST_RESOURCES("process-test-resources"),
+    TEST_COMPILE("test-compile"),
+    PROCESS_TEST_CLASSES("process-test-classes"),
+    TEST("test"),
+    PREPARE_PACKAGE("prepare-package"),
+    PACKAGE("package"),
+    PRE_INTEGRATION_TEST("pre-integration-test"),
+    INTEGRATION_TEST("integration-test"),
+    POST_INTEGRATION_TEST("post-integration-test"),
+    VERIFY("verify"),
+    INSTALL("install"),
+    DEPLOY("deploy"),
 
-    VALIDATE( "validate" ),
+    PRE_CLEAN("pre-clean"),
-    INITIALIZE( "initialize" ),
+    CLEAN("clean"),
-    GENERATE_SOURCES( "generate-sources" ),
+    POST_CLEAN("post-clean"),
-    PROCESS_SOURCES( "process-sources" ),
-    GENERATE_RESOURCES( "generate-resources" ),
-    PROCESS_RESOURCES( "process-resources" ),
-    COMPILE( "compile" ),
-    PROCESS_CLASSES( "process-classes" ),
-    GENERATE_TEST_SOURCES( "generate-test-sources" ),
-    PROCESS_TEST_SOURCES( "process-test-sources" ),
-    GENERATE_TEST_RESOURCES( "generate-test-resources" ),
-    PROCESS_TEST_RESOURCES( "process-test-resources" ),
-    TEST_COMPILE( "test-compile" ),
-    PROCESS_TEST_CLASSES( "process-test-classes" ),
-    TEST( "test" ),
-    PREPARE_PACKAGE( "prepare-package" ),
-    PACKAGE( "package" ),
-    PRE_INTEGRATION_TEST( "pre-integration-test" ),
-    INTEGRATION_TEST( "integration-test" ),
-    POST_INTEGRATION_TEST( "post-integration-test" ),
-    VERIFY( "verify" ),
-    INSTALL( "install" ),
-    DEPLOY( "deploy" ),
 
-    PRE_CLEAN( "pre-clean" ),
+    PRE_SITE("pre-site"),
-    CLEAN( "clean" ),
+    SITE("site"),
-    POST_CLEAN( "post-clean" ),
+    POST_SITE("post-site"),
+    SITE_DEPLOY("site-deploy"),
 
-    PRE_SITE( "pre-site" ),
+    NONE("");
-    SITE( "site" ),
-    POST_SITE( "post-site" ),
-    SITE_DEPLOY( "site-deploy" ),
-
-    NONE( "" );
 
     private final String id;
 
-    LifecyclePhase( String id )
+    LifecyclePhase(String id) {
-    {
         this.id = id;
     }
 
-    public String id()
+    public String id() {
-    {
         return this.id;
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Mojo.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.plugin.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -25,7 +24,6 @@ import java.lang.annotation.Inherited;
 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;
 
@@ -36,11 +34,10 @@ import org.apache.maven.api.annotations.Experimental;
  */
 @Experimental
 @Documented
-@Retention( RetentionPolicy.CLASS )
+@Retention(RetentionPolicy.CLASS)
-@Target( ElementType.TYPE )
+@Target(ElementType.TYPE)
 @Inherited
-public @interface Mojo
+public @interface Mojo {
-{
     /**
      * goal name (required).
      * @return the goal name
@@ -94,5 +91,4 @@ public @interface Mojo
      * @return the configurator bean name
      */
     String configurator() default "";
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Parameter.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.plugin.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -25,7 +24,6 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.apache.maven.api.annotations.Experimental;
 
 /**
@@ -41,11 +39,10 @@ import org.apache.maven.api.annotations.Experimental;
  */
 @Experimental
 @Documented
-@Retention( RetentionPolicy.CLASS )
+@Retention(RetentionPolicy.CLASS)
-@Target( { ElementType.FIELD, ElementType.METHOD } )
+@Target({ElementType.FIELD, ElementType.METHOD})
 @Inherited
-public @interface Parameter
+public @interface Parameter {
-{
     /**
      * name of the bean property used to get/set the field: by default, field name is used.
      * @return the name of the bean property

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.ArtifactCoordinate;
@@ -32,8 +31,7 @@ import org.apache.maven.api.annotations.Nonnull;
  * @since 4.0
  */
 @Experimental
-public interface ArtifactCoordinateFactory extends Service
+public interface ArtifactCoordinateFactory extends Service {
-{
 
     /**
      * Creates a coordinate.
@@ -43,29 +41,36 @@ public interface ArtifactCoordinateFactory extends Service
      * @throws IllegalArgumentException if {@code request} is null or {@code request.session} is null or invalid
      */
     @Nonnull
-    ArtifactCoordinate create( @Nonnull ArtifactCoordinateFactoryRequest request );
+    ArtifactCoordinate create(@Nonnull ArtifactCoordinateFactoryRequest request);
 
     @Nonnull
-    default ArtifactCoordinate create( @Nonnull Session session, String groupId,
+    default ArtifactCoordinate create(
-                                       String artifactId, String version, String extension )
+            @Nonnull Session session, String groupId, String artifactId, String version, String extension) {
-    {
+        return create(ArtifactCoordinateFactoryRequest.build(session, groupId, artifactId, version, extension));
-        return create( ArtifactCoordinateFactoryRequest.build( session, groupId, artifactId, version, extension ) );
     }
 
     @Nonnull
-    default ArtifactCoordinate create( @Nonnull Session session, String groupId, String artifactId, String version,
+    default ArtifactCoordinate create(
-                                       String classifier, String extension, String type )
+            @Nonnull Session session,
-    {
+            String groupId,
-        return create( ArtifactCoordinateFactoryRequest.build( session, groupId, artifactId,
+            String artifactId,
-                                                     version, classifier, extension, type ) );
+            String version,
+            String classifier,
+            String extension,
+            String type) {
+        return create(ArtifactCoordinateFactoryRequest.build(
+                session, groupId, artifactId, version, classifier, extension, type));
     }
 
     @Nonnull
-    default ArtifactCoordinate create( @Nonnull Session session, Artifact artifact )
+    default ArtifactCoordinate create(@Nonnull Session session, Artifact artifact) {
-    {
+        return create(ArtifactCoordinateFactoryRequest.build(
-        return create( ArtifactCoordinateFactoryRequest.build( session,
+                session,
-                artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion().asString(),
+                artifact.getGroupId(),
-                artifact.getClassifier(), artifact.getExtension(), null ) );
+                artifact.getArtifactId(),
+                artifact.getVersion().asString(),
+                artifact.getClassifier(),
+                artifact.getExtension(),
+                null));
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactoryRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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;
@@ -26,8 +27,6 @@ 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.
  *
@@ -35,8 +34,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
  */
 @Experimental
 @Immutable
-public interface ArtifactCoordinateFactoryRequest
+public interface ArtifactCoordinateFactoryRequest {
-{
 
     @Nonnull
     Session getSession();
@@ -54,55 +52,55 @@ public interface ArtifactCoordinateFactoryRequest
     String getType();
 
     @Nonnull
-    static ArtifactCoordinateFactoryRequest build( @Nonnull Session session, String groupId, String artifactId,
+    static ArtifactCoordinateFactoryRequest build(
-                                                   String version, String extension )
+            @Nonnull Session session, String groupId, String artifactId, String version, String extension) {
-    {
         return ArtifactCoordinateFactoryRequest.builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .groupId( groupId )
+                .groupId(groupId)
-                .artifactId( artifactId )
+                .artifactId(artifactId)
-                .version( version )
+                .version(version)
-                .extension( extension )
+                .extension(extension)
                 .build();
     }
 
     @Nonnull
-    static ArtifactCoordinateFactoryRequest build( @Nonnull Session session, String groupId, String artifactId,
+    static ArtifactCoordinateFactoryRequest build(
-                                                   String version, String classifier, String extension, String type )
+            @Nonnull Session session,
-    {
+            String groupId,
+            String artifactId,
+            String version,
+            String classifier,
+            String extension,
+            String type) {
         return ArtifactCoordinateFactoryRequest.builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .groupId( groupId )
+                .groupId(groupId)
-                .artifactId( artifactId )
+                .artifactId(artifactId)
-                .version( version )
+                .version(version)
-                .classifier( classifier )
+                .classifier(classifier)
-                .extension( extension )
+                .extension(extension)
-                .type( type )
+                .type(type)
                 .build();
     }
 
     @Nonnull
-    static ArtifactCoordinateFactoryRequest build( @Nonnull Session session, @Nonnull ArtifactCoordinate coordinate )
+    static ArtifactCoordinateFactoryRequest build(@Nonnull Session session, @Nonnull ArtifactCoordinate coordinate) {
-    {
         return ArtifactCoordinateFactoryRequest.builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .groupId( nonNull( coordinate, "coordinate cannot be null" ).getGroupId() )
+                .groupId(nonNull(coordinate, "coordinate cannot be null").getGroupId())
-                .artifactId( coordinate.getArtifactId() )
+                .artifactId(coordinate.getArtifactId())
-                .classifier( coordinate.getClassifier() )
+                .classifier(coordinate.getClassifier())
-                .version( coordinate.getVersion().asString() )
+                .version(coordinate.getVersion().asString())
-                .extension( coordinate.getExtension() )
+                .extension(coordinate.getExtension())
                 .build();
     }
 
-
+    static ArtifactFactoryRequestBuilder builder() {
-    static ArtifactFactoryRequestBuilder builder()
-    {
         return new ArtifactFactoryRequestBuilder();
     }
 
     @NotThreadSafe
-    class ArtifactFactoryRequestBuilder
+    class ArtifactFactoryRequestBuilder {
-    {
         private Session session;
         private String groupId;
         private String artifactId;
@@ -111,61 +109,50 @@ public interface ArtifactCoordinateFactoryRequest
         private String extension;
         private String type;
 
-        ArtifactFactoryRequestBuilder()
+        ArtifactFactoryRequestBuilder() {}
-        {
-        }
 
-        public ArtifactFactoryRequestBuilder session( Session session )
+        public ArtifactFactoryRequestBuilder session(Session session) {
-        {
             this.session = session;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder groupId( String groupId )
+        public ArtifactFactoryRequestBuilder groupId(String groupId) {
-        {
             this.groupId = groupId;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder artifactId( String artifactId )
+        public ArtifactFactoryRequestBuilder artifactId(String artifactId) {
-        {
             this.artifactId = artifactId;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder version( String version )
+        public ArtifactFactoryRequestBuilder version(String version) {
-        {
             this.version = version;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder classifier( String classifier )
+        public ArtifactFactoryRequestBuilder classifier(String classifier) {
-        {
             this.classifier = classifier;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder extension( String extension )
+        public ArtifactFactoryRequestBuilder extension(String extension) {
-        {
             this.extension = extension;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder type( String type )
+        public ArtifactFactoryRequestBuilder type(String type) {
-        {
             this.type = type;
             return this;
         }
 
-        public ArtifactCoordinateFactoryRequest build()
+        public ArtifactCoordinateFactoryRequest build() {
-        {
+            return new DefaultArtifactFactoryRequestArtifact(
-            return new DefaultArtifactFactoryRequestArtifact( session, groupId, artifactId, version,
+                    session, groupId, artifactId, version, classifier, extension, type);
-                                                      classifier, extension, type );
         }
 
-        private static class DefaultArtifactFactoryRequestArtifact extends BaseRequest implements
+        private static class DefaultArtifactFactoryRequestArtifact extends BaseRequest
-                                                                                       ArtifactCoordinateFactoryRequest
+                implements ArtifactCoordinateFactoryRequest {
-        {
             private final String groupId;
             private final String artifactId;
             private final String version;
@@ -173,15 +160,15 @@ public interface ArtifactCoordinateFactoryRequest
             private final String extension;
             private final String type;
 
-            DefaultArtifactFactoryRequestArtifact( @Nonnull Session session,
+            DefaultArtifactFactoryRequestArtifact(
+                    @Nonnull Session session,
                     String groupId,
                     String artifactId,
                     String version,
                     String classifier,
                     String extension,
-                                                   String type )
+                    String type) {
-            {
+                super(session);
-                super( session );
                 this.groupId = groupId;
                 this.artifactId = artifactId;
                 this.version = version;
@@ -191,41 +178,34 @@ public interface ArtifactCoordinateFactoryRequest
             }
 
             @Override
-            public String getGroupId()
+            public String getGroupId() {
-            {
                 return groupId;
             }
 
             @Override
-            public String getArtifactId()
+            public String getArtifactId() {
-            {
                 return artifactId;
             }
 
             @Override
-            public String getVersion()
+            public String getVersion() {
-            {
                 return version;
             }
 
             @Override
-            public String getClassifier()
+            public String getClassifier() {
-            {
                 return classifier;
             }
 
             @Override
-            public String getExtension()
+            public String getExtension() {
-            {
                 return extension;
             }
 
             @Override
-            public String getType()
+            public String getType() {
-            {
                 return type;
             }
         }
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployer.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,13 +16,13 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import java.util.Collection;
-
-import org.apache.maven.api.Service;
-import org.apache.maven.api.Session;
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.RemoteRepository;
+import org.apache.maven.api.Service;
+import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 
@@ -35,14 +33,13 @@ import org.apache.maven.api.annotations.Nonnull;
  * @see Session#deployArtifact(RemoteRepository, Artifact...)
  */
 @Experimental
-public interface ArtifactDeployer extends Service
+public interface ArtifactDeployer extends Service {
-{
 
     /**
      * @param request {@link ArtifactDeployerRequest}
      * @throws ArtifactDeployerException if the deployment failed
      */
-    void deploy( @Nonnull ArtifactDeployerRequest request );
+    void deploy(@Nonnull ArtifactDeployerRequest request);
 
     /**
      * @param session the repository session
@@ -51,11 +48,8 @@ public interface ArtifactDeployer extends Service
      * @throws ArtifactDeployerException if the deployment failed
      * @throws IllegalArgumentException if an argument is {@code null} or invalid
      */
-    default void deploy( @Nonnull Session session,
+    default void deploy(
-                         @Nonnull RemoteRepository repository,
+            @Nonnull Session session, @Nonnull RemoteRepository repository, @Nonnull Collection<Artifact> artifacts) {
-                         @Nonnull Collection<Artifact> artifacts )
+        deploy(ArtifactDeployerRequest.build(session, repository, artifacts));
-    {
-        deploy( ArtifactDeployerRequest.build( session, repository, artifacts ) );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,9 +26,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class ArtifactDeployerException
+public class ArtifactDeployerException extends MavenException {
-    extends MavenException
-{
 
     /**
      *
@@ -40,9 +37,7 @@ public class ArtifactDeployerException
      * @param message the message of the error
      * @param e {@link Exception}
      */
-    public ArtifactDeployerException( String message, Exception e )
+    public ArtifactDeployerException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,19 +16,18 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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 java.util.Collection;
-
-import org.apache.maven.api.Session;
-import org.apache.maven.api.Artifact;
-import org.apache.maven.api.RemoteRepository;
-
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 /**
  * A request for deploying one or more artifacts to a remote repository.
  *
@@ -38,8 +35,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
  */
 @Experimental
 @Immutable
-public interface ArtifactDeployerRequest
+public interface ArtifactDeployerRequest {
-{
 
     @Nonnull
     Session getSession();
@@ -53,105 +49,88 @@ public interface ArtifactDeployerRequest
     int getRetryFailedDeploymentCount();
 
     @Nonnull
-    static ArtifactDeployerRequestBuilder builder()
+    static ArtifactDeployerRequestBuilder builder() {
-    {
         return new ArtifactDeployerRequestBuilder();
     }
 
     @Nonnull
-    static ArtifactDeployerRequest build( @Nonnull Session session,
+    static ArtifactDeployerRequest build(
-                                          @Nonnull RemoteRepository repository,
+            @Nonnull Session session, @Nonnull RemoteRepository repository, @Nonnull Collection<Artifact> artifacts) {
-                                          @Nonnull Collection<Artifact> artifacts )
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .repository( nonNull( repository, "repository cannot be null" ) )
+                .repository(nonNull(repository, "repository cannot be null"))
-                .artifacts( nonNull( artifacts, "artifacts cannot be null" ) )
+                .artifacts(nonNull(artifacts, "artifacts cannot be null"))
                 .build();
     }
 
-    class ArtifactDeployerRequestBuilder
+    class ArtifactDeployerRequestBuilder {
-    {
         Session session;
         RemoteRepository repository;
         Collection<Artifact> artifacts;
         int retryFailedDeploymentCount;
 
-        ArtifactDeployerRequestBuilder()
+        ArtifactDeployerRequestBuilder() {}
-        {
-        }
 
         @Nonnull
-        public ArtifactDeployerRequestBuilder session( Session session )
+        public ArtifactDeployerRequestBuilder session(Session session) {
-        {
             this.session = session;
             return this;
         }
 
         @Nonnull
-        public ArtifactDeployerRequestBuilder repository( RemoteRepository repository )
+        public ArtifactDeployerRequestBuilder repository(RemoteRepository repository) {
-        {
             this.repository = repository;
             return this;
         }
 
-        public ArtifactDeployerRequestBuilder artifacts( Collection<Artifact> artifacts )
+        public ArtifactDeployerRequestBuilder artifacts(Collection<Artifact> artifacts) {
-        {
             this.artifacts = artifacts;
             return this;
         }
 
-        public ArtifactDeployerRequestBuilder retryFailedDeploymentCount( int retryFailedDeploymentCount )
+        public ArtifactDeployerRequestBuilder retryFailedDeploymentCount(int retryFailedDeploymentCount) {
-        {
             this.retryFailedDeploymentCount = retryFailedDeploymentCount;
             return this;
         }
 
         @Nonnull
-        public ArtifactDeployerRequest build()
+        public ArtifactDeployerRequest build() {
-        {
+            return new DefaultArtifactDeployerRequest(session, repository, artifacts, retryFailedDeploymentCount);
-            return new DefaultArtifactDeployerRequest( session, repository, artifacts, retryFailedDeploymentCount );
         }
 
-        private static class DefaultArtifactDeployerRequest extends BaseRequest
+        private static class DefaultArtifactDeployerRequest extends BaseRequest implements ArtifactDeployerRequest {
-                implements ArtifactDeployerRequest
-        {
 
             private final RemoteRepository repository;
             private final Collection<Artifact> artifacts;
             private final int retryFailedDeploymentCount;
 
-            DefaultArtifactDeployerRequest( @Nonnull Session session,
+            DefaultArtifactDeployerRequest(
+                    @Nonnull Session session,
                     @Nonnull RemoteRepository repository,
                     @Nonnull Collection<Artifact> artifacts,
-                                            int retryFailedDeploymentCount )
+                    int retryFailedDeploymentCount) {
-            {
+                super(session);
-                super( session );
+                this.repository = nonNull(repository, "repository cannot be null");
-                this.repository = nonNull( repository, "repository cannot be null" );
+                this.artifacts = unmodifiable(nonNull(artifacts, "artifacts cannot be null"));
-                this.artifacts = unmodifiable( nonNull( artifacts, "artifacts cannot be null" ) );
                 this.retryFailedDeploymentCount = retryFailedDeploymentCount;
             }
 
             @Nonnull
             @Override
-            public RemoteRepository getRepository()
+            public RemoteRepository getRepository() {
-            {
                 return repository;
             }
 
             @Nonnull
             @Override
-            public Collection<Artifact> getArtifacts()
+            public Collection<Artifact> getArtifacts() {
-            {
                 return artifacts;
             }
 
             @Override
-            public int getRetryFailedDeploymentCount()
+            public int getRetryFailedDeploymentCount() {
-            {
                 return retryFailedDeploymentCount;
             }
         }
-
     }
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,10 +16,11 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
+import org.apache.maven.api.Artifact;
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Session;
-import org.apache.maven.api.Artifact;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 
@@ -31,8 +30,7 @@ import org.apache.maven.api.annotations.Nonnull;
  * @since 4.0
  */
 @Experimental
-public interface ArtifactFactory extends Service
+public interface ArtifactFactory extends Service {
-{
 
     /**
      * Creates an artifact.
@@ -42,20 +40,23 @@ public interface ArtifactFactory extends Service
      * @throws IllegalArgumentException if {@code request} is null or {@code request.session} is null or invalid
      */
     @Nonnull
-    Artifact create( @Nonnull ArtifactFactoryRequest request );
+    Artifact create(@Nonnull ArtifactFactoryRequest request);
 
     @Nonnull
-    default Artifact create( @Nonnull Session session, String groupId,
+    default Artifact create(
-                             String artifactId, String version, String extension )
+            @Nonnull Session session, String groupId, String artifactId, String version, String extension) {
-    {
+        return create(ArtifactFactoryRequest.build(session, groupId, artifactId, version, extension));
-        return create( ArtifactFactoryRequest.build( session, groupId, artifactId, version, extension ) );
     }
 
     @Nonnull
-    default Artifact create( @Nonnull Session session, String groupId, String artifactId, String version,
+    default Artifact create(
-                             String classifier, String extension, String type )
+            @Nonnull Session session,
-    {
+            String groupId,
-        return create( ArtifactFactoryRequest.build( session, groupId, artifactId,
+            String artifactId,
-                                                     version, classifier, extension, type ) );
+            String version,
+            String classifier,
+            String extension,
+            String type) {
+        return create(ArtifactFactoryRequest.build(session, groupId, artifactId, version, classifier, extension, type));
     }
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,16 +16,16 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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.Session;
 import org.apache.maven.api.annotations.NotThreadSafe;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 /**
  *
  *
@@ -35,8 +33,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
  */
 @Experimental
 @Immutable
-public interface ArtifactFactoryRequest
+public interface ArtifactFactoryRequest {
-{
 
     @Nonnull
     Session getSession();
@@ -53,40 +50,42 @@ public interface ArtifactFactoryRequest
 
     String getType();
 
-    static ArtifactFactoryRequest build( Session session, String groupId, String artifactId,
+    static ArtifactFactoryRequest build(
-                                         String version, String extension )
+            Session session, String groupId, String artifactId, String version, String extension) {
-    {
         return ArtifactFactoryRequest.builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .groupId( groupId )
+                .groupId(groupId)
-                .artifactId( artifactId )
+                .artifactId(artifactId)
-                .version( version )
+                .version(version)
-                .extension( extension )
+                .extension(extension)
                 .build();
     }
 
-    static ArtifactFactoryRequest build( Session session, String groupId, String artifactId,
+    static ArtifactFactoryRequest build(
-                                         String version, String classifier, String extension, String type )
+            Session session,
-    {
+            String groupId,
+            String artifactId,
+            String version,
+            String classifier,
+            String extension,
+            String type) {
         return ArtifactFactoryRequest.builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .groupId( groupId )
+                .groupId(groupId)
-                .artifactId( artifactId )
+                .artifactId(artifactId)
-                .version( version )
+                .version(version)
-                .classifier( classifier )
+                .classifier(classifier)
-                .extension( extension )
+                .extension(extension)
-                .type( type )
+                .type(type)
                 .build();
     }
 
-    static ArtifactFactoryRequestBuilder builder()
+    static ArtifactFactoryRequestBuilder builder() {
-    {
         return new ArtifactFactoryRequestBuilder();
     }
 
     @NotThreadSafe
-    class ArtifactFactoryRequestBuilder
+    class ArtifactFactoryRequestBuilder {
-    {
         private Session session;
         private String groupId;
         private String artifactId;
@@ -95,60 +94,49 @@ public interface ArtifactFactoryRequest
         private String extension;
         private String type;
 
-        ArtifactFactoryRequestBuilder()
+        ArtifactFactoryRequestBuilder() {}
-        {
-        }
 
-        public ArtifactFactoryRequestBuilder session( Session session )
+        public ArtifactFactoryRequestBuilder session(Session session) {
-        {
             this.session = session;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder groupId( String groupId )
+        public ArtifactFactoryRequestBuilder groupId(String groupId) {
-        {
             this.groupId = groupId;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder artifactId( String artifactId )
+        public ArtifactFactoryRequestBuilder artifactId(String artifactId) {
-        {
             this.artifactId = artifactId;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder version( String version )
+        public ArtifactFactoryRequestBuilder version(String version) {
-        {
             this.version = version;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder classifier( String classifier )
+        public ArtifactFactoryRequestBuilder classifier(String classifier) {
-        {
             this.classifier = classifier;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder extension( String extension )
+        public ArtifactFactoryRequestBuilder extension(String extension) {
-        {
             this.extension = extension;
             return this;
         }
 
-        public ArtifactFactoryRequestBuilder type( String type )
+        public ArtifactFactoryRequestBuilder type(String type) {
-        {
             this.type = type;
             return this;
         }
 
-        public ArtifactFactoryRequest build()
+        public ArtifactFactoryRequest build() {
-        {
+            return new DefaultArtifactFactoryRequest(
-            return new DefaultArtifactFactoryRequest( session, groupId, artifactId, version,
+                    session, groupId, artifactId, version, classifier, extension, type);
-                                                      classifier, extension, type );
         }
 
-        private static class DefaultArtifactFactoryRequest extends BaseRequest implements ArtifactFactoryRequest
+        private static class DefaultArtifactFactoryRequest extends BaseRequest implements ArtifactFactoryRequest {
-        {
             private final String groupId;
             private final String artifactId;
             private final String version;
@@ -156,15 +144,15 @@ public interface ArtifactFactoryRequest
             private final String extension;
             private final String type;
 
-            DefaultArtifactFactoryRequest( @Nonnull Session session,
+            DefaultArtifactFactoryRequest(
+                    @Nonnull Session session,
                     String groupId,
                     String artifactId,
                     String version,
                     String classifier,
                     String extension,
-                                           String type )
+                    String type) {
-            {
+                super(session);
-                super( session );
                 this.groupId = groupId;
                 this.artifactId = artifactId;
                 this.version = version;
@@ -174,41 +162,34 @@ public interface ArtifactFactoryRequest
             }
 
             @Override
-            public String getGroupId()
+            public String getGroupId() {
-            {
                 return groupId;
             }
 
             @Override
-            public String getArtifactId()
+            public String getArtifactId() {
-            {
                 return artifactId;
             }
 
             @Override
-            public String getVersion()
+            public String getVersion() {
-            {
                 return version;
             }
 
             @Override
-            public String getClassifier()
+            public String getClassifier() {
-            {
                 return classifier;
             }
 
             @Override
-            public String getExtension()
+            public String getExtension() {
-            {
                 return extension;
             }
 
             @Override
-            public String getType()
+            public String getType() {
-            {
                 return type;
             }
         }
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstaller.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,13 +16,13 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 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;
-import org.apache.maven.api.Artifact;
 import org.apache.maven.api.annotations.Experimental;
 
 /**
@@ -34,14 +32,13 @@ import org.apache.maven.api.annotations.Experimental;
  * @see Session#withLocalRepository(org.apache.maven.api.LocalRepository)
  */
 @Experimental
-public interface ArtifactInstaller extends Service
+public interface ArtifactInstaller extends Service {
-{
     /**
      * @param request {@link ArtifactInstallerRequest}
      * @throws ArtifactInstallerException in case of an error
      * @throws IllegalArgumentException in case {@code request} is {@code null}
      */
-    void install( ArtifactInstallerRequest request );
+    void install(ArtifactInstallerRequest request);
 
     /**
      * @param session the repository session
@@ -51,9 +48,8 @@ public interface ArtifactInstaller extends Service
      * @throws IllegalArgumentException in case of parameter {@code session} is {@code null} or
      *          {@code artifact} is {@code null}.
      */
-    default void install( Session session, Artifact artifact )
+    default void install(Session session, Artifact artifact) {
-    {
+        install(session, Collections.singletonList(artifact));
-        install( session, Collections.singletonList( artifact ) );
     }
 
     /**
@@ -66,9 +62,7 @@ public interface ArtifactInstaller extends Service
      *             or parameter {@code mavenArtifacts} is {@code null} or
      *             {@code mavenArtifacts.isEmpty()} is {@code true}.
      */
-    default void install( Session session, Collection<Artifact> artifacts )
+    default void install(Session session, Collection<Artifact> artifacts) {
-    {
+        install(ArtifactInstallerRequest.build(session, artifacts));
-        install( ArtifactInstallerRequest.build( session, artifacts ) );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -25,9 +24,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class ArtifactInstallerException
+public class ArtifactInstallerException extends MavenException {
-    extends MavenException
-{
 
     /**
      *
@@ -38,9 +35,7 @@ public class ArtifactInstallerException
      * @param message the message of the error
      * @param e {@link Exception}
      */
-    public ArtifactInstallerException( String message, Exception e )
+    public ArtifactInstallerException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,21 +16,20 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 import org.apache.maven.api.annotations.Nullable;
 
-import java.util.Collection;
-import java.util.Collections;
-
-import org.apache.maven.api.Session;
-import org.apache.maven.api.Artifact;
-
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 /**
  * A request for installing one or more artifacts in the local repository.
  *
@@ -40,8 +37,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
  */
 @Experimental
 @Immutable
-public interface ArtifactInstallerRequest
+public interface ArtifactInstallerRequest {
-{
 
     @Nonnull
     Session getSession();
@@ -50,70 +46,56 @@ public interface ArtifactInstallerRequest
     Collection<Artifact> getArtifacts();
 
     @Nonnull
-    static ArtifactInstallerRequestBuilder builder()
+    static ArtifactInstallerRequestBuilder builder() {
-    {
         return new ArtifactInstallerRequestBuilder();
     }
 
     @Nonnull
-    static ArtifactInstallerRequest build( Session session, Collection<Artifact> artifacts )
+    static ArtifactInstallerRequest build(Session session, Collection<Artifact> artifacts) {
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .artifacts( nonNull( artifacts, "artifacts cannot be null" ) )
+                .artifacts(nonNull(artifacts, "artifacts cannot be null"))
                 .build();
     }
 
     @NotThreadSafe
-    class ArtifactInstallerRequestBuilder
+    class ArtifactInstallerRequestBuilder {
-    {
         Session session;
         Collection<Artifact> artifacts = Collections.emptyList();
 
-        ArtifactInstallerRequestBuilder()
+        ArtifactInstallerRequestBuilder() {}
-        {
-        }
 
         @Nonnull
-        public ArtifactInstallerRequestBuilder session( @Nonnull Session session )
+        public ArtifactInstallerRequestBuilder session(@Nonnull Session session) {
-        {
             this.session = session;
             return this;
         }
 
         @Nonnull
-        public ArtifactInstallerRequestBuilder artifacts( @Nullable Collection<Artifact> artifacts )
+        public ArtifactInstallerRequestBuilder artifacts(@Nullable Collection<Artifact> artifacts) {
-        {
             this.artifacts = artifacts != null ? artifacts : Collections.emptyList();
             return this;
         }
 
         @Nonnull
-        public ArtifactInstallerRequest build()
+        public ArtifactInstallerRequest build() {
-        {
+            return new DefaultArtifactInstallerRequest(session, artifacts);
-            return new DefaultArtifactInstallerRequest( session, artifacts );
         }
 
-        static class DefaultArtifactInstallerRequest extends BaseRequest
+        static class DefaultArtifactInstallerRequest extends BaseRequest implements ArtifactInstallerRequest {
-                implements ArtifactInstallerRequest
-        {
 
             private final Collection<Artifact> artifacts;
 
-            DefaultArtifactInstallerRequest( @Nonnull Session session,
+            DefaultArtifactInstallerRequest(@Nonnull Session session, @Nonnull Collection<Artifact> artifacts) {
-                                             @Nonnull Collection<Artifact> artifacts )
+                super(session);
-            {
+                this.artifacts = unmodifiable(nonNull(artifacts, "artifacts cannot be null"));
-                super( session );
-                this.artifacts = unmodifiable( nonNull( artifacts, "artifacts cannot be null" ) );
             }
 
             @Nonnull
             @Override
-            public Collection<Artifact> getArtifacts()
+            public Collection<Artifact> getArtifacts() {
-            {
                 return artifacts;
             }
         }
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactManager.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,34 +16,31 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.api.services;
-import org.apache.maven.api.Service;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
 
 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;
+import org.apache.maven.api.annotations.Nonnull;
 
 /**
  *
  * @since 4.0
  */
 @Experimental
-public interface ArtifactManager extends Service
+public interface ArtifactManager extends Service {
-{
 
     /**
      * Returns the path of the file previously associated to this artifact
      * or {@code Optional.empty()} if no path has been associated.
      */
     @Nonnull
-    Optional<Path> getPath( @Nonnull Artifact artifact );
+    Optional<Path> getPath(@Nonnull Artifact artifact);
 
     /**
      * Associates the given file path to the artifact.
      */
-    void setPath( @Nonnull Artifact artifact, Path path );
+    void setPath(@Nonnull Artifact artifact, Path path);
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolver.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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;
@@ -32,8 +30,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public interface ArtifactResolver extends Service
+public interface ArtifactResolver extends Service {
-{
 
     /**
      * @param request {@link ArtifactResolverRequest}
@@ -42,7 +39,7 @@ public interface ArtifactResolver extends Service
      * @throws IllegalArgumentException in case of parameter {@code buildingRequest} is {@code null} or
      *             parameter {@code mavenArtifact} is {@code null} or invalid
      */
-    ArtifactResolverResult resolve( ArtifactResolverRequest request );
+    ArtifactResolverResult resolve(ArtifactResolverRequest request);
 
     /**
      * @param session {@link Session}
@@ -52,10 +49,7 @@ public interface ArtifactResolver extends Service
      * @throws IllegalArgumentException in case of parameter {@code buildingRequest} is {@code null} or
      *             parameter {@code coordinate} is {@code null} or invalid
      */
-    default ArtifactResolverResult resolve( Session session,
+    default ArtifactResolverResult resolve(Session session, Collection<? extends ArtifactCoordinate> coordinates) {
-                                            Collection<? extends ArtifactCoordinate> coordinates )
+        return resolve(ArtifactResolverRequest.build(session, coordinates));
-    {
-        return resolve( ArtifactResolverRequest.build( session, coordinates ) );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,9 +26,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class ArtifactResolverException
+public class ArtifactResolverException extends MavenException {
-    extends MavenException
-{
 
     private static final long serialVersionUID = 7252294837746943917L;
 
@@ -37,9 +34,7 @@ public class ArtifactResolverException
      * @param message the message for the exception
      * @param e the exception itself
      */
-    public ArtifactResolverException( String message, Exception e )
+    public ArtifactResolverException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,11 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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;
@@ -28,8 +28,6 @@ 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.
  *
@@ -37,8 +35,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
  */
 @Experimental
 @Immutable
-public interface ArtifactResolverRequest
+public interface ArtifactResolverRequest {
-{
     @Nonnull
     Session getSession();
 
@@ -46,70 +43,58 @@ public interface ArtifactResolverRequest
     Collection<? extends ArtifactCoordinate> getCoordinates();
 
     @Nonnull
-    static ArtifactResolverRequestBuilder builder()
+    static ArtifactResolverRequestBuilder builder() {
-    {
         return new ArtifactResolverRequestBuilder();
     }
 
     @Nonnull
-    static ArtifactResolverRequest build( @Nonnull Session session,
+    static ArtifactResolverRequest build(
-                                          @Nonnull Collection<? extends ArtifactCoordinate> coordinates )
+            @Nonnull Session session, @Nonnull Collection<? extends ArtifactCoordinate> coordinates) {
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .coordinates( nonNull( coordinates, "coordinates cannot be null" ) )
+                .coordinates(nonNull(coordinates, "coordinates cannot be null"))
                 .build();
     }
 
     @NotThreadSafe
-    class ArtifactResolverRequestBuilder
+    class ArtifactResolverRequestBuilder {
-    {
         Session session;
         Collection<? extends ArtifactCoordinate> coordinates;
 
-        ArtifactResolverRequestBuilder()
+        ArtifactResolverRequestBuilder() {}
-        {
-        }
 
         @Nonnull
-        public ArtifactResolverRequestBuilder session( Session session )
+        public ArtifactResolverRequestBuilder session(Session session) {
-        {
             this.session = session;
             return this;
         }
 
         @Nonnull
-        public ArtifactResolverRequestBuilder coordinates( Collection<? extends ArtifactCoordinate> coordinates )
+        public ArtifactResolverRequestBuilder coordinates(Collection<? extends ArtifactCoordinate> coordinates) {
-        {
             this.coordinates = coordinates;
             return this;
         }
 
         @Nonnull
-        public ArtifactResolverRequest build()
+        public ArtifactResolverRequest build() {
-        {
+            return new DefaultArtifactResolverRequest(session, coordinates);
-            return new DefaultArtifactResolverRequest( session, coordinates );
         }
 
-        private static class DefaultArtifactResolverRequest extends BaseRequest implements ArtifactResolverRequest
+        private static class DefaultArtifactResolverRequest extends BaseRequest implements ArtifactResolverRequest {
-        {
             @Nonnull
             private final Collection<? extends ArtifactCoordinate> coordinates;
 
-            DefaultArtifactResolverRequest( @Nonnull Session session,
+            DefaultArtifactResolverRequest(
-                                            @Nonnull Collection<? extends ArtifactCoordinate> coordinates )
+                    @Nonnull Session session, @Nonnull Collection<? extends ArtifactCoordinate> coordinates) {
-            {
+                super(session);
-                super( session );
+                this.coordinates = unmodifiable(nonNull(coordinates, "coordinates cannot be null"));
-                this.coordinates = unmodifiable( nonNull( coordinates, "coordinates cannot be null" ) );
             }
 
             @Nonnull
             @Override
-            public Collection<? extends ArtifactCoordinate> getCoordinates()
+            public Collection<? extends ArtifactCoordinate> getCoordinates() {
-            {
                 return coordinates;
             }
         }
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverResult.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,10 +16,10 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 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;
@@ -32,12 +30,10 @@ import org.apache.maven.api.annotations.Nonnull;
  * @since 4.0
  */
 @Experimental
-public interface ArtifactResolverResult
+public interface ArtifactResolverResult {
-{
     /**
      * @return {@link Artifact}
      */
     @Nonnull
     Map<Artifact, Path> getArtifacts();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,14 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.api.services;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
 
 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;
 
 /**
  * Base class for requests.
@@ -34,34 +31,29 @@ import org.apache.maven.api.Session;
  * @since 4.0
  */
 @Experimental
-abstract class BaseRequest
+abstract class BaseRequest {
-{
 
     private final Session session;
 
-    protected BaseRequest( @Nonnull Session session )
+    protected BaseRequest(@Nonnull Session session) {
-    {
+        this.session = nonNull(session, "session cannot be null");
-        this.session = nonNull( session, "session cannot be null" );
     }
 
     @Nonnull
-    public Session getSession()
+    public Session getSession() {
-    {
         return session;
     }
 
-    public static <T> T nonNull( T obj, String message )
+    public static <T> T nonNull(T obj, String message) {
-    {
+        if (obj == null) {
-        if ( obj == null )
+            throw new IllegalArgumentException(message);
-        {
-            throw new IllegalArgumentException( message );
         }
         return obj;
     }
 
-    protected static <T> Collection<T> unmodifiable( Collection<T> obj )
+    protected static <T> Collection<T> unmodifiable(Collection<T> obj) {
-    {
         return obj != null && !obj.isEmpty()
-                ? Collections.unmodifiableCollection( new ArrayList<>( obj ) ) : Collections.emptyList();
+                ? Collections.unmodifiableCollection(new ArrayList<>(obj))
+                : Collections.emptyList();
     }
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/BuilderProblem.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
@@ -32,8 +31,7 @@ import org.apache.maven.api.annotations.Nullable;
  */
 @Experimental
 @Immutable
-public interface BuilderProblem
+public interface BuilderProblem {
-{
 
     /**
      * Gets the hint about the source of the problem. While the syntax of this hint is unspecified and depends on the
@@ -102,12 +100,9 @@ public interface BuilderProblem
      * @since 4.0
      */
     @Experimental
-    enum Severity
+    enum Severity {
-    {
-
         FATAL, //
         ERROR, //
         WARNING //
-
     }
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollector.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,15 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
-import org.apache.maven.api.Service;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
-
-import org.apache.maven.api.Session;
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.DependencyCoordinate;
 import org.apache.maven.api.Project;
+import org.apache.maven.api.Service;
+import org.apache.maven.api.Session;
+import org.apache.maven.api.annotations.Experimental;
+import org.apache.maven.api.annotations.Nonnull;
 
 /**
  * The DependencyCollector service can be used to collect dependencies
@@ -37,8 +35,7 @@ import org.apache.maven.api.Project;
  * @since 4.0
  */
 @Experimental
-public interface DependencyCollector extends Service
+public interface DependencyCollector extends Service {
-{
 
     /**
      * Collects the transitive dependencies and builds a dependency graph.
@@ -55,7 +52,7 @@ public interface DependencyCollector extends Service
      * @see DependencyCollector#collect(Session, Artifact)
      */
     @Nonnull
-    DependencyCollectorResult collect( @Nonnull DependencyCollectorRequest request );
+    DependencyCollectorResult collect(@Nonnull DependencyCollectorRequest request);
 
     /**
      * Collects the transitive dependencies of some artifacts and builds a dependency graph. Note that this operation is
@@ -70,10 +67,8 @@ public interface DependencyCollector extends Service
      * @see #collect(DependencyCollectorRequest)
      */
     @Nonnull
-    default DependencyCollectorResult collect( @Nonnull Session session,
+    default DependencyCollectorResult collect(@Nonnull Session session, @Nonnull DependencyCoordinate root) {
-                                               @Nonnull DependencyCoordinate root )
+        return collect(DependencyCollectorRequest.build(session, root));
-    {
-        return collect( DependencyCollectorRequest.build( session, root ) );
     }
 
     /**
@@ -89,10 +84,8 @@ public interface DependencyCollector extends Service
      * @see #collect(DependencyCollectorRequest)
      */
     @Nonnull
-    default DependencyCollectorResult collect( @Nonnull Session session,
+    default DependencyCollectorResult collect(@Nonnull Session session, @Nonnull Project project) {
-                                               @Nonnull Project project )
+        return collect(DependencyCollectorRequest.build(session, project));
-    {
-        return collect( DependencyCollectorRequest.build( session, project ) );
     }
 
     /**
@@ -108,10 +101,7 @@ public interface DependencyCollector extends Service
      * @see #collect(DependencyCollectorRequest)
      */
     @Nonnull
-    default DependencyCollectorResult collect( @Nonnull Session session,
+    default DependencyCollectorResult collect(@Nonnull Session session, @Nonnull Artifact artifact) {
-                                               @Nonnull Artifact artifact )
+        return collect(DependencyCollectorRequest.build(session, artifact));
-    {
-        return collect( DependencyCollectorRequest.build( session, artifact ) );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -28,9 +27,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class DependencyCollectorException
+public class DependencyCollectorException extends MavenException {
-    extends MavenException
-{
     /**
      *
      */
@@ -40,8 +37,7 @@ public class DependencyCollectorException
      * @param message the message you would give for the exception
      * @param cause the cause which is related to the message
      */
-    public DependencyCollectorException( String message, Throwable cause )
+    public DependencyCollectorException(String message, Throwable cause) {
-    {
+        super(message, cause);
-        super( message, cause );
     }
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,13 +16,15 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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,8 +35,6 @@ import org.apache.maven.api.annotations.Nonnull;
 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
@@ -49,8 +47,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
  */
 @Experimental
 @Immutable
-public interface DependencyCollectorRequest
+public interface DependencyCollectorRequest {
-{
 
     @Nonnull
     Session getSession();
@@ -70,43 +67,38 @@ public interface DependencyCollectorRequest
     boolean getVerbose();
 
     @Nonnull
-    static DependencyCollectorRequest build( @Nonnull Session session, Artifact root )
+    static DependencyCollectorRequest build(@Nonnull Session session, Artifact root) {
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .rootArtifact( nonNull( root, "root cannot be null" ) )
+                .rootArtifact(nonNull(root, "root cannot be null"))
                 .build();
     }
 
     @Nonnull
-    static DependencyCollectorRequest build( @Nonnull Session session, @Nonnull DependencyCoordinate root )
+    static DependencyCollectorRequest build(@Nonnull Session session, @Nonnull DependencyCoordinate root) {
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .root( nonNull( root, "root cannot be null" ) )
+                .root(nonNull(root, "root cannot be null"))
                 .build();
     }
 
     @Nonnull
-    static DependencyCollectorRequest build( @Nonnull Session session, @Nonnull Project project )
+    static DependencyCollectorRequest build(@Nonnull Session session, @Nonnull Project project) {
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .rootArtifact( nonNull( project, "project cannot be null" ).getArtifact() )
+                .rootArtifact(nonNull(project, "project cannot be null").getArtifact())
-                .dependencies( project.getDependencies() )
+                .dependencies(project.getDependencies())
-                .managedDependencies( project.getManagedDependencies() )
+                .managedDependencies(project.getManagedDependencies())
                 .build();
     }
 
     @Nonnull
-    static DependencyCollectorRequestBuilder builder()
+    static DependencyCollectorRequestBuilder builder() {
-    {
         return new DependencyCollectorRequestBuilder();
     }
 
     @NotThreadSafe
-    class DependencyCollectorRequestBuilder
+    class DependencyCollectorRequestBuilder {
-    {
 
         Session session;
         Artifact rootArtifact;
@@ -115,13 +107,10 @@ public interface DependencyCollectorRequest
         List<DependencyCoordinate> managedDependencies = Collections.emptyList();
         boolean verbose;
 
-        DependencyCollectorRequestBuilder()
+        DependencyCollectorRequestBuilder() {}
-        {
-        }
 
         @Nonnull
-        public DependencyCollectorRequestBuilder session( @Nonnull Session session )
+        public DependencyCollectorRequestBuilder session(@Nonnull Session session) {
-        {
             this.session = session;
             return this;
         }
@@ -138,8 +127,7 @@ public interface DependencyCollectorRequest
          * @return this request for chaining, never {@code null}
          */
         @Nonnull
-        public DependencyCollectorRequestBuilder rootArtifact( @Nullable Artifact rootArtifact )
+        public DependencyCollectorRequestBuilder rootArtifact(@Nullable Artifact rootArtifact) {
-        {
             this.rootArtifact = rootArtifact;
             return this;
         }
@@ -149,8 +137,7 @@ public interface DependencyCollectorRequest
          * @return this request for chaining, never {@code null}
          */
         @Nonnull
-        public DependencyCollectorRequestBuilder root( @Nonnull DependencyCoordinate root )
+        public DependencyCollectorRequestBuilder root(@Nonnull DependencyCoordinate root) {
-        {
             this.root = root;
             return this;
         }
@@ -164,9 +151,8 @@ public interface DependencyCollectorRequest
          * @return this request for chaining, never {@code null}
          */
         @Nonnull
-        public DependencyCollectorRequestBuilder dependencies( @Nullable List<DependencyCoordinate> dependencies )
+        public DependencyCollectorRequestBuilder dependencies(@Nullable List<DependencyCoordinate> dependencies) {
-        {
+            this.dependencies = (dependencies != null) ? dependencies : Collections.emptyList();
-            this.dependencies = ( dependencies != null ) ? dependencies : Collections.emptyList();
             return this;
         }
 
@@ -177,20 +163,16 @@ public interface DependencyCollectorRequest
          * @return this request for chaining, never {@code null}
          */
         @Nonnull
-        public DependencyCollectorRequestBuilder dependency( @Nullable DependencyCoordinate dependency )
+        public DependencyCollectorRequestBuilder dependency(@Nullable DependencyCoordinate dependency) {
-        {
+            if (dependency != null) {
-            if ( dependency != null )
+                if (this.dependencies.isEmpty()) {
-            {
-                if ( this.dependencies.isEmpty() )
-                {
                     this.dependencies = new ArrayList<>();
                 }
-                this.dependencies.add( dependency );
+                this.dependencies.add(dependency);
             }
             return this;
         }
 
-
         /**
          * Sets the dependency management to apply to transitive dependencies. To clarify, this management does not
          * apply to
@@ -201,9 +183,8 @@ public interface DependencyCollectorRequest
          */
         @Nonnull
         public DependencyCollectorRequestBuilder managedDependencies(
-                        @Nullable List<DependencyCoordinate> managedDependencies )
+                @Nullable List<DependencyCoordinate> managedDependencies) {
-        {
+            this.managedDependencies = (managedDependencies != null) ? managedDependencies : Collections.emptyList();
-            this.managedDependencies = ( managedDependencies != null ) ? managedDependencies : Collections.emptyList();
             return this;
         }
 
@@ -215,15 +196,12 @@ public interface DependencyCollectorRequest
          * @return this request for chaining, never {@code null}
          */
         @Nonnull
-        public DependencyCollectorRequestBuilder managedDependency( @Nullable DependencyCoordinate managedDependency )
+        public DependencyCollectorRequestBuilder managedDependency(@Nullable DependencyCoordinate managedDependency) {
-        {
+            if (managedDependency != null) {
-            if ( managedDependency != null )
+                if (this.managedDependencies.isEmpty()) {
-            {
-                if ( this.managedDependencies.isEmpty() )
-                {
                     this.managedDependencies = new ArrayList<>();
                 }
-                this.managedDependencies.add( managedDependency );
+                this.managedDependencies.add(managedDependency);
             }
             return this;
         }
@@ -235,34 +213,24 @@ public interface DependencyCollectorRequest
          * @return this request for chaining, never {@code null}
          */
         @Nonnull
-        public DependencyCollectorRequestBuilder verbose( boolean verbose )
+        public DependencyCollectorRequestBuilder verbose(boolean verbose) {
-        {
             this.verbose = verbose;
             return this;
         }
 
         @Nonnull
-        public DependencyCollectorRequest build()
+        public DependencyCollectorRequest build() {
-        {
             return new DefaultDependencyCollectorRequest(
-                    session,
+                    session, rootArtifact, root, dependencies, managedDependencies, verbose);
-                    rootArtifact,
-                    root,
-                    dependencies,
-                    managedDependencies,
-                    verbose );
         }
 
-        static class DefaultDependencyCollectorRequest extends BaseRequest
+        static class DefaultDependencyCollectorRequest extends BaseRequest implements DependencyCollectorRequest {
-                implements DependencyCollectorRequest
-        {
             private final Artifact rootArtifact;
             private final DependencyCoordinate root;
             private final Collection<DependencyCoordinate> dependencies;
             private final Collection<DependencyCoordinate> managedDependencies;
             private final boolean verbose;
 
-
             /**
              * Creates a request with the specified properties.
              *
@@ -276,59 +244,50 @@ public interface DependencyCollectorRequest
                     @Nullable DependencyCoordinate root,
                     @Nonnull Collection<DependencyCoordinate> dependencies,
                     @Nonnull Collection<DependencyCoordinate> managedDependencies,
-                    boolean verbose )
+                    boolean verbose) {
-            {
+                super(session);
-                super( session );
                 this.rootArtifact = rootArtifact;
                 this.root = root;
-                this.dependencies = unmodifiable( nonNull( dependencies, "dependencies cannot be null" ) );
+                this.dependencies = unmodifiable(nonNull(dependencies, "dependencies cannot be null"));
-                this.managedDependencies = unmodifiable( nonNull( managedDependencies,
+                this.managedDependencies =
-                                                         "managedDependencies cannot be null" ) );
+                        unmodifiable(nonNull(managedDependencies, "managedDependencies cannot be null"));
                 this.verbose = verbose;
             }
 
             @Nonnull
             @Override
-            public Optional<Artifact> getRootArtifact()
+            public Optional<Artifact> getRootArtifact() {
-            {
+                return Optional.ofNullable(rootArtifact);
-                return Optional.ofNullable( rootArtifact );
             }
 
             @Nonnull
             @Override
-            public Optional<DependencyCoordinate> getRoot()
+            public Optional<DependencyCoordinate> getRoot() {
-            {
+                return Optional.ofNullable(root);
-                return Optional.ofNullable( root );
             }
 
             @Nonnull
             @Override
-            public Collection<DependencyCoordinate> getDependencies()
+            public Collection<DependencyCoordinate> getDependencies() {
-            {
                 return dependencies;
             }
 
             @Nonnull
             @Override
-            public Collection<DependencyCoordinate> getManagedDependencies()
+            public Collection<DependencyCoordinate> getManagedDependencies() {
-            {
                 return managedDependencies;
             }
 
             @Override
-            public boolean getVerbose()
+            public boolean getVerbose() {
-            {
                 return verbose;
             }
 
             @Nonnull
             @Override
-            public String toString()
+            public String toString() {
-            {
                 return getRoot() + " -> " + getDependencies();
             }
-
         }
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorResult.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import java.util.List;
-
 import org.apache.maven.api.Node;
 import org.apache.maven.api.annotations.Experimental;
 
@@ -31,8 +29,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @see DependencyCollector#collect(DependencyCollectorRequest)
  */
 @Experimental
-public interface DependencyCollectorResult
+public interface DependencyCollectorResult {
-{
     /**
      * Gets the exceptions that occurred while building the dependency graph.
      *
@@ -46,5 +43,4 @@ public interface DependencyCollectorResult
      * @return the root node of the dependency graph or {@code null} if none
      */
     Node getRoot();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.DependencyCoordinate;
@@ -34,8 +33,7 @@ import org.apache.maven.api.model.ReportPlugin;
  * @since 4.0
  */
 @Experimental
-public interface DependencyCoordinateFactory extends Service
+public interface DependencyCoordinateFactory extends Service {
-{
 
     /**
      * Creates a new {@link DependencyCoordinate} object from the request.
@@ -47,43 +45,47 @@ public interface DependencyCoordinateFactory extends Service
      *         if {@code request.getSession()} is null or invalid
      */
     @Nonnull
-    DependencyCoordinate create( @Nonnull DependencyCoordinateFactoryRequest request );
+    DependencyCoordinate create(@Nonnull DependencyCoordinateFactoryRequest request);
 
     @Nonnull
-    default DependencyCoordinate create( @Nonnull Session session, @Nonnull ArtifactCoordinate coordinate )
+    default DependencyCoordinate create(@Nonnull Session session, @Nonnull ArtifactCoordinate coordinate) {
-    {
+        return create(DependencyCoordinateFactoryRequest.build(session, coordinate));
-        return create( DependencyCoordinateFactoryRequest.build( session, coordinate ) );
     }
 
     @Nonnull
-    default DependencyCoordinate create( @Nonnull Session session, @Nonnull org.apache.maven.api.Dependency dependency )
+    default DependencyCoordinate create(@Nonnull Session session, @Nonnull org.apache.maven.api.Dependency dependency) {
-    {
+        return create(DependencyCoordinateFactoryRequest.build(session, dependency));
-        return create( DependencyCoordinateFactoryRequest.build( session, dependency ) );
     }
 
     @Nonnull
-    default DependencyCoordinate create( @Nonnull Session session, Dependency dependency )
+    default DependencyCoordinate create(@Nonnull Session session, Dependency dependency) {
-    {
+        return create(DependencyCoordinateFactoryRequest.build(
-        return create( DependencyCoordinateFactoryRequest.build( session,
+                session,
-                dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion(),
+                dependency.getGroupId(),
-                dependency.getClassifier(), null, dependency.getType() ) );
+                dependency.getArtifactId(),
+                dependency.getVersion(),
+                dependency.getClassifier(),
+                null,
+                dependency.getType()));
     }
 
     @Nonnull
-    default DependencyCoordinate create( @Nonnull Session session, Plugin plugin )
+    default DependencyCoordinate create(@Nonnull Session session, Plugin plugin) {
-    {
         // TODO: hard coded string
-        return create( DependencyCoordinateFactoryRequest.build( session,
+        return create(DependencyCoordinateFactoryRequest.build(
-                plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion(),
+                session, plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion(), null, null, "maven-plugin"));
-                null, null, "maven-plugin" ) );
     }
 
     @Nonnull
-    default DependencyCoordinate create( @Nonnull Session session, ReportPlugin reportPlugin )
+    default DependencyCoordinate create(@Nonnull Session session, ReportPlugin reportPlugin) {
-    {
         // TODO: hard coded string
-        return create( DependencyCoordinateFactoryRequest.build( session,
+        return create(DependencyCoordinateFactoryRequest.build(
-                reportPlugin.getGroupId(), reportPlugin.getArtifactId(), reportPlugin.getVersion(),
+                session,
-                null, null, "maven-plugin" ) );
+                reportPlugin.getGroupId(),
+                reportPlugin.getArtifactId(),
+                reportPlugin.getVersion(),
+                null,
+                null,
+                "maven-plugin"));
     }
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactoryRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,11 +16,13 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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,16 +32,13 @@ 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;
-
 /**
  *
  * @since 4.0
  */
 @Experimental
 @Immutable
-public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFactoryRequest
+public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFactoryRequest {
-{
 
     String getScope();
 
@@ -51,58 +48,59 @@ public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFa
     Collection<Exclusion> getExclusions();
 
     @Nonnull
-    static DependencyCoordinateFactoryRequest build( @Nonnull Session session, String groupId, String artifactId,
+    static DependencyCoordinateFactoryRequest build(
-                                                   String version, String classifier, String extension, String type )
+            @Nonnull Session session,
-    {
+            String groupId,
+            String artifactId,
+            String version,
+            String classifier,
+            String extension,
+            String type) {
         return DependencyCoordinateFactoryRequest.builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .groupId( groupId )
+                .groupId(groupId)
-                .artifactId( artifactId )
+                .artifactId(artifactId)
-                .version( version )
+                .version(version)
-                .classifier( classifier )
+                .classifier(classifier)
-                .extension( extension )
+                .extension(extension)
-                .type( type )
+                .type(type)
                 .build();
     }
 
     @Nonnull
-    static DependencyCoordinateFactoryRequest build( @Nonnull Session session, @Nonnull ArtifactCoordinate coordinate )
+    static DependencyCoordinateFactoryRequest build(@Nonnull Session session, @Nonnull ArtifactCoordinate coordinate) {
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .groupId( nonNull( coordinate, "coordinate cannot be null" ).getGroupId() )
+                .groupId(nonNull(coordinate, "coordinate cannot be null").getGroupId())
-                .artifactId( coordinate.getArtifactId() )
+                .artifactId(coordinate.getArtifactId())
-                .version( coordinate.getVersion().asString() )
+                .version(coordinate.getVersion().asString())
-                .classifier( coordinate.getClassifier() )
+                .classifier(coordinate.getClassifier())
-                .extension( coordinate.getExtension() )
+                .extension(coordinate.getExtension())
                 .build();
     }
 
     @Nonnull
-    static DependencyCoordinateFactoryRequest build( @Nonnull Session session, @Nonnull Dependency dependency )
+    static DependencyCoordinateFactoryRequest build(@Nonnull Session session, @Nonnull Dependency dependency) {
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .groupId( nonNull( dependency, "dependency" ).getGroupId() )
+                .groupId(nonNull(dependency, "dependency").getGroupId())
-                .artifactId( dependency.getArtifactId() )
+                .artifactId(dependency.getArtifactId())
-                .version( dependency.getVersion().asString() )
+                .version(dependency.getVersion().asString())
-                .classifier( dependency.getClassifier() )
+                .classifier(dependency.getClassifier())
-                .extension( dependency.getExtension() )
+                .extension(dependency.getExtension())
-                .type( dependency.getType().getName() )
+                .type(dependency.getType().getName())
-                .scope( dependency.getScope().id() )
+                .scope(dependency.getScope().id())
-                .optional( dependency.isOptional() )
+                .optional(dependency.isOptional())
                 .build();
     }
 
     @Nonnull
-    static DependencyCoordinateFactoryRequestBuilder builder()
+    static DependencyCoordinateFactoryRequestBuilder builder() {
-    {
         return new DependencyCoordinateFactoryRequestBuilder();
     }
 
     @NotThreadSafe
-    class DependencyCoordinateFactoryRequestBuilder
+    class DependencyCoordinateFactoryRequestBuilder {
-    {
         private Session session;
         private String groupId;
         private String artifactId;
@@ -114,100 +112,80 @@ public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFa
         private boolean optional;
         private Collection<Exclusion> exclusions = Collections.emptyList();
 
-        DependencyCoordinateFactoryRequestBuilder()
+        DependencyCoordinateFactoryRequestBuilder() {}
-        {
-        }
 
-        public DependencyCoordinateFactoryRequestBuilder session( Session session )
+        public DependencyCoordinateFactoryRequestBuilder session(Session session) {
-        {
             this.session = session;
             return this;
         }
 
-        public DependencyCoordinateFactoryRequestBuilder groupId( String groupId )
+        public DependencyCoordinateFactoryRequestBuilder groupId(String groupId) {
-        {
             this.groupId = groupId;
             return this;
         }
 
-        public DependencyCoordinateFactoryRequestBuilder artifactId( String artifactId )
+        public DependencyCoordinateFactoryRequestBuilder artifactId(String artifactId) {
-        {
             this.artifactId = artifactId;
             return this;
         }
 
-        public DependencyCoordinateFactoryRequestBuilder version( String version )
+        public DependencyCoordinateFactoryRequestBuilder version(String version) {
-        {
             this.version = version;
             return this;
         }
 
-        public DependencyCoordinateFactoryRequestBuilder classifier( String classifier )
+        public DependencyCoordinateFactoryRequestBuilder classifier(String classifier) {
-        {
             this.classifier = classifier;
             return this;
         }
 
-        public DependencyCoordinateFactoryRequestBuilder extension( String extension )
+        public DependencyCoordinateFactoryRequestBuilder extension(String extension) {
-        {
             this.extension = extension;
             return this;
         }
 
-        public DependencyCoordinateFactoryRequestBuilder type( String type )
+        public DependencyCoordinateFactoryRequestBuilder type(String type) {
-        {
             this.type = type;
             return this;
         }
 
-        public DependencyCoordinateFactoryRequestBuilder scope( String scope )
+        public DependencyCoordinateFactoryRequestBuilder scope(String scope) {
-        {
             this.scope = scope;
             return this;
         }
 
-        public DependencyCoordinateFactoryRequestBuilder optional( boolean optional )
+        public DependencyCoordinateFactoryRequestBuilder optional(boolean optional) {
-        {
             this.optional = optional;
             return this;
         }
 
-        public DependencyCoordinateFactoryRequestBuilder exclusions( Collection<Exclusion> exclusions )
+        public DependencyCoordinateFactoryRequestBuilder exclusions(Collection<Exclusion> exclusions) {
-        {
+            if (exclusions != null) {
-            if ( exclusions != null )
+                if (this.exclusions.isEmpty()) {
-            {
-                if ( this.exclusions.isEmpty() )
-                {
                     this.exclusions = new ArrayList<>();
                 }
-                this.exclusions.addAll( exclusions );
+                this.exclusions.addAll(exclusions);
             }
             return this;
         }
 
-        public DependencyCoordinateFactoryRequestBuilder exclusion( Exclusion exclusion )
+        public DependencyCoordinateFactoryRequestBuilder exclusion(Exclusion exclusion) {
-        {
+            if (exclusion != null) {
-            if ( exclusion != null )
+                if (this.exclusions.isEmpty()) {
-            {
-                if ( this.exclusions.isEmpty() )
-                {
                     this.exclusions = new ArrayList<>();
                 }
-                this.exclusions.add( exclusion );
+                this.exclusions.add(exclusion);
             }
             return this;
         }
 
-        public DependencyCoordinateFactoryRequest build()
+        public DependencyCoordinateFactoryRequest build() {
-        {
+            return new DefaultDependencyCoordinateFactoryRequest(
-            return new DefaultDependencyCoordinateFactoryRequest( session, groupId, artifactId, version,
+                    session, groupId, artifactId, version, classifier, extension, type, scope, optional, exclusions);
-                    classifier, extension, type, scope, optional, exclusions );
         }
 
-        private static class DefaultDependencyCoordinateFactoryRequest
+        private static class DefaultDependencyCoordinateFactoryRequest extends BaseRequest
-                extends BaseRequest
+                implements DependencyCoordinateFactoryRequest {
-                implements DependencyCoordinateFactoryRequest
-        {
             private final String groupId;
             private final String artifactId;
             private final String version;
@@ -218,9 +196,10 @@ public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFa
             private final boolean optional;
             private final Collection<Exclusion> exclusions;
 
-            @SuppressWarnings( "checkstyle:ParameterNumber" )
+            @SuppressWarnings("checkstyle:ParameterNumber")
             private DefaultDependencyCoordinateFactoryRequest(
-                            @Nonnull Session session, String groupId,
+                    @Nonnull Session session,
+                    String groupId,
                     String artifactId,
                     String version,
                     String classifier,
@@ -228,9 +207,8 @@ public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFa
                     String type,
                     String scope,
                     boolean optional,
-                            Collection<Exclusion> exclusions )
+                    Collection<Exclusion> exclusions) {
-            {
+                super(session);
-                super( session );
                 this.groupId = groupId;
                 this.artifactId = artifactId;
                 this.version = version;
@@ -243,60 +221,50 @@ public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFa
             }
 
             @Override
-            public String getGroupId()
+            public String getGroupId() {
-            {
                 return groupId;
             }
 
             @Override
-            public String getArtifactId()
+            public String getArtifactId() {
-            {
                 return artifactId;
             }
 
             @Override
-            public String getVersion()
+            public String getVersion() {
-            {
                 return version;
             }
 
             @Override
-            public String getClassifier()
+            public String getClassifier() {
-            {
                 return classifier;
             }
 
             @Override
-            public String getExtension()
+            public String getExtension() {
-            {
                 return extension;
             }
 
             @Override
-            public String getType()
+            public String getType() {
-            {
                 return type;
             }
 
             @Override
-            public String getScope()
+            public String getScope() {
-            {
                 return scope;
             }
 
             @Override
-            public boolean isOptional()
+            public boolean isOptional() {
-            {
                 return optional;
             }
 
             @Nonnull
             @Override
-            public Collection<Exclusion> getExclusions()
+            public Collection<Exclusion> getExclusions() {
-            {
                 return exclusions;
             }
         }
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/LocalRepositoryManager.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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;
@@ -33,11 +31,9 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public interface LocalRepositoryManager extends Service
+public interface LocalRepositoryManager extends Service {
-{
 
-    Path getPathForLocalArtifact( Session session, LocalRepository local, Artifact artifact );
+    Path getPathForLocalArtifact(Session session, LocalRepository local, Artifact artifact);
-
-    Path getPathForRemoteArtifact( Session session, LocalRepository local, RemoteRepository remote, Artifact artifact );
 
+    Path getPathForRemoteArtifact(Session session, LocalRepository local, RemoteRepository remote, Artifact artifact);
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/Lookup.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,21 +16,19 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import java.util.List;
 import java.util.Map;
-
 import org.apache.maven.api.Service;
 
-public interface Lookup extends Service
+public interface Lookup extends Service {
-{
 
-    <T> T lookup( Class<T> type );
+    <T> T lookup(Class<T> type);
 
-    <T> T lookup( Class<T> type, String name );
+    <T> T lookup(Class<T> type, String name);
 
-    <T> List<T> lookupList( Class<T> type );
+    <T> List<T> lookupList(Class<T> type);
-
-    <T> Map<String, T> lookupMap( Class<T> type );
 
+    <T> Map<String, T> lookupMap(Class<T> type);
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/LookupException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,24 +26,19 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class LookupException
+public class LookupException extends MavenException {
-    extends MavenException
-{
     /**
      * @param message the message to give
      * @param e the {@link Exception}
      */
-    public LookupException( String message, Exception e )
+    public LookupException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
 
     /**
      * @param e the {@link Exception}
      */
-    public LookupException( Exception e )
+    public LookupException(Exception e) {
-    {
+        super(e);
-        super( e );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/MavenException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,25 +26,18 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class MavenException extends RuntimeException
+public class MavenException extends RuntimeException {
-{
+    public MavenException() {}
-    public MavenException()
+
-    {
+    public MavenException(String message) {
+        super(message);
     }
 
-    public MavenException( String message )
+    public MavenException(String message, Throwable cause) {
-    {
+        super(message, cause);
-        super( message );
     }
 
-    public MavenException( String message, Throwable cause )
+    public MavenException(Throwable cause) {
-    {
+        super(cause);
-        super( message, cause );
     }
-
-    public MavenException( Throwable cause )
-    {
-        super( cause );
-    }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/MessageBuilder.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Nonnull;
 
@@ -27,8 +26,7 @@ import org.apache.maven.api.annotations.Nonnull;
  * @since 4.0
  * @see MessageBuilderFactory
  */
-public interface MessageBuilder
+public interface MessageBuilder {
-{
     /**
      * Append message content in success style.
      * By default, bold green
@@ -36,7 +34,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder success( Object message );
+    MessageBuilder success(Object message);
 
     /**
      * Append message content in warning style.
@@ -45,7 +43,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder warning( Object message );
+    MessageBuilder warning(Object message);
 
     /**
      * Append message content in failure style.
@@ -54,7 +52,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder failure( Object message );
+    MessageBuilder failure(Object message);
 
     /**
      * Append message content in strong style.
@@ -63,7 +61,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder strong( Object message );
+    MessageBuilder strong(Object message);
 
     /**
      * Append message content in mojo style.
@@ -72,7 +70,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder mojo( Object message );
+    MessageBuilder mojo(Object message);
 
     /**
      * Append message content in project style.
@@ -81,7 +79,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder project( Object message );
+    MessageBuilder project(Object message);
 
     //
     // message building methods modelled after Ansi methods
@@ -94,7 +92,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder a( char[] value, int offset, int len );
+    MessageBuilder a(char[] value, int offset, int len);
 
     /**
      * Append content to the message buffer.
@@ -102,7 +100,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder a( char[] value );
+    MessageBuilder a(char[] value);
 
     /**
      * Append content to the message buffer.
@@ -112,7 +110,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder a( CharSequence value, int start, int end );
+    MessageBuilder a(CharSequence value, int start, int end);
 
     /**
      * Append content to the message buffer.
@@ -120,7 +118,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder a( CharSequence value );
+    MessageBuilder a(CharSequence value);
 
     /**
      * Append content to the message buffer.
@@ -128,7 +126,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder a( Object value );
+    MessageBuilder a(Object value);
 
     /**
      * Append newline to the message buffer.
@@ -145,7 +143,7 @@ public interface MessageBuilder
      * @return the current builder
      */
     @Nonnull
-    MessageBuilder format( String pattern, Object... args );
+    MessageBuilder format(String pattern, Object... args);
 
     /**
      * Return the built message.
@@ -153,5 +151,4 @@ public interface MessageBuilder
      */
     @Nonnull
     String build();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/MessageBuilderFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.Service;
 import org.apache.maven.api.annotations.Experimental;
@@ -29,8 +28,7 @@ import org.apache.maven.api.annotations.Nonnull;
  * @since 4.0
  */
 @Experimental
-public interface MessageBuilderFactory extends Service
+public interface MessageBuilderFactory extends Service {
-{
     /**
      * Checks if the underlying output does support styling or not.
      * @return whether color styling is supported or not
@@ -56,7 +54,7 @@ public interface MessageBuilderFactory extends Service
      * @return a new message builder
      */
     @Nonnull
-    MessageBuilder builder( @Nonnull StringBuilder stringBuilder );
+    MessageBuilder builder(@Nonnull StringBuilder stringBuilder);
 
     /**
      * Creates a new message builder of the specified size.
@@ -64,8 +62,7 @@ public interface MessageBuilderFactory extends Service
      * @return a new message builder
      */
     @Nonnull
-    default MessageBuilder builder( int size )
+    default MessageBuilder builder(int size) {
-    {
+        return builder(new StringBuilder(size));
-        return builder( new StringBuilder( size ) );
     }
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilder.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,23 +16,21 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.api.services;
-import org.apache.maven.api.ArtifactCoordinate;
-import org.apache.maven.api.Service;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
 
 import java.nio.file.Path;
-
-import org.apache.maven.api.Session;
 import org.apache.maven.api.Artifact;
+import org.apache.maven.api.ArtifactCoordinate;
+import org.apache.maven.api.Service;
+import org.apache.maven.api.Session;
+import org.apache.maven.api.annotations.Experimental;
+import org.apache.maven.api.annotations.Nonnull;
 
 /**
  * @since 4.0
  */
 @Experimental
-public interface ProjectBuilder extends Service
+public interface ProjectBuilder extends Service {
-{
 
     /**
      * Creates a {@link org.apache.maven.api.Project} from a POM file.
@@ -45,7 +41,7 @@ public interface ProjectBuilder extends Service
      * @throws IllegalArgumentException if an argument is {@code null} or invalid
      */
     @Nonnull
-    ProjectBuilderResult build( ProjectBuilderRequest request );
+    ProjectBuilderResult build(ProjectBuilderRequest request);
 
     /**
      * Creates a {@link org.apache.maven.api.Project} from a POM file.
@@ -57,9 +53,8 @@ public interface ProjectBuilder extends Service
      * @see #build(ProjectBuilderRequest)
      */
     @Nonnull
-    default ProjectBuilderResult build( @Nonnull Session session, @Nonnull Source source )
+    default ProjectBuilderResult build(@Nonnull Session session, @Nonnull Source source) {
-    {
+        return build(ProjectBuilderRequest.build(session, source));
-        return build( ProjectBuilderRequest.build( session, source ) );
     }
 
     /**
@@ -72,9 +67,8 @@ public interface ProjectBuilder extends Service
      * @see #build(ProjectBuilderRequest)
      */
     @Nonnull
-    default ProjectBuilderResult build( @Nonnull Session session, @Nonnull Path path )
+    default ProjectBuilderResult build(@Nonnull Session session, @Nonnull Path path) {
-    {
+        return build(ProjectBuilderRequest.build(session, path));
-        return build( ProjectBuilderRequest.build( session, path ) );
     }
 
     /**
@@ -87,9 +81,8 @@ public interface ProjectBuilder extends Service
      * @see #build(ProjectBuilderRequest)
      */
     @Nonnull
-    default ProjectBuilderResult build( @Nonnull Session session, @Nonnull Artifact artifact )
+    default ProjectBuilderResult build(@Nonnull Session session, @Nonnull Artifact artifact) {
-    {
+        return build(ProjectBuilderRequest.build(session, artifact));
-        return build( ProjectBuilderRequest.build( session, artifact ) );
     }
 
     /**
@@ -102,9 +95,7 @@ public interface ProjectBuilder extends Service
      * @see #build(ProjectBuilderRequest)
      */
     @Nonnull
-    default ProjectBuilderResult build( @Nonnull Session session, @Nonnull ArtifactCoordinate coordinate )
+    default ProjectBuilderResult build(@Nonnull Session session, @Nonnull ArtifactCoordinate coordinate) {
-    {
+        return build(ProjectBuilderRequest.build(session, coordinate));
-        return build( ProjectBuilderRequest.build( session, coordinate ) );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,16 +26,12 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class ProjectBuilderException
+public class ProjectBuilderException extends MavenException {
-    extends MavenException
-{
     /**
      * @param message the message to give
      * @param e the {@link Exception}
      */
-    public ProjectBuilderException( String message, Exception e )
+    public ProjectBuilderException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,22 +16,21 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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;
 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 org.apache.maven.api.annotations.Nullable;
 
-import java.nio.file.Path;
-import java.util.Optional;
-
-import org.apache.maven.api.Session;
-import org.apache.maven.api.Artifact;
-
-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.
@@ -42,8 +39,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
  */
 @Experimental
 @Immutable
-public interface ProjectBuilderRequest
+public interface ProjectBuilderRequest {
-{
 
     @Nonnull
     Session getSession();
@@ -69,50 +65,44 @@ public interface ProjectBuilderRequest
     boolean isResolveDependencies();
 
     @Nonnull
-    static ProjectBuilderRequest build( @Nonnull Session session, @Nonnull Source source )
+    static ProjectBuilderRequest build(@Nonnull Session session, @Nonnull Source source) {
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .source( nonNull( source, "source cannot be null" ) )
+                .source(nonNull(source, "source cannot be null"))
                 .build();
     }
 
     @Nonnull
-    static ProjectBuilderRequest build( @Nonnull Session session, @Nonnull Path path )
+    static ProjectBuilderRequest build(@Nonnull Session session, @Nonnull Path path) {
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .path( nonNull( path, "path cannot be null" ) )
+                .path(nonNull(path, "path cannot be null"))
                 .build();
     }
 
     @Nonnull
-    static ProjectBuilderRequest build( @Nonnull Session session, @Nonnull Artifact artifact )
+    static ProjectBuilderRequest build(@Nonnull Session session, @Nonnull Artifact artifact) {
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .artifact( nonNull( artifact, "artifact cannot be null" ) )
+                .artifact(nonNull(artifact, "artifact cannot be null"))
                 .build();
     }
 
     @Nonnull
-    static ProjectBuilderRequest build( @Nonnull Session session, @Nonnull ArtifactCoordinate coordinate )
+    static ProjectBuilderRequest build(@Nonnull Session session, @Nonnull ArtifactCoordinate coordinate) {
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .coordinate( nonNull( coordinate, "coordinate cannot be null" ) )
+                .coordinate(nonNull(coordinate, "coordinate cannot be null"))
                 .build();
     }
 
     @Nonnull
-    static ProjectBuilderRequestBuilder builder()
+    static ProjectBuilderRequestBuilder builder() {
-    {
         return new ProjectBuilderRequestBuilder();
     }
 
     @NotThreadSafe
-    class ProjectBuilderRequestBuilder
+    class ProjectBuilderRequestBuilder {
-    {
         Session session;
         Path path;
         Source source;
@@ -123,61 +113,57 @@ public interface ProjectBuilderRequest
         boolean processPlugins = true;
         boolean resolveDependencies = true;
 
-        ProjectBuilderRequestBuilder()
+        ProjectBuilderRequestBuilder() {}
-        {
-        }
 
-        public ProjectBuilderRequestBuilder session( Session session )
+        public ProjectBuilderRequestBuilder session(Session session) {
-        {
             this.session = session;
             return this;
         }
 
-        public ProjectBuilderRequestBuilder path( Path path )
+        public ProjectBuilderRequestBuilder path(Path path) {
-        {
             this.path = path;
             return this;
         }
 
-        public ProjectBuilderRequestBuilder source( Source source )
+        public ProjectBuilderRequestBuilder source(Source source) {
-        {
             this.source = source;
             return this;
         }
 
-        public ProjectBuilderRequestBuilder artifact( Artifact artifact )
+        public ProjectBuilderRequestBuilder artifact(Artifact artifact) {
-        {
             this.artifact = artifact;
             return this;
         }
 
-        public ProjectBuilderRequestBuilder coordinate( ArtifactCoordinate coordinate )
+        public ProjectBuilderRequestBuilder coordinate(ArtifactCoordinate coordinate) {
-        {
             this.coordinate = coordinate;
             return this;
         }
 
-        public ProjectBuilderRequestBuilder processPlugins( boolean processPlugins )
+        public ProjectBuilderRequestBuilder processPlugins(boolean processPlugins) {
-        {
             this.processPlugins = processPlugins;
             return this;
         }
 
-        public ProjectBuilderRequestBuilder resolveDependencies( boolean resolveDependencies )
+        public ProjectBuilderRequestBuilder resolveDependencies(boolean resolveDependencies) {
-        {
             this.resolveDependencies = resolveDependencies;
             return this;
         }
 
-        public ProjectBuilderRequest build()
+        public ProjectBuilderRequest build() {
-        {
+            return new DefaultProjectBuilderRequest(
-            return new DefaultProjectBuilderRequest( session, path, source, artifact, coordinate,
+                    session,
-                    allowStubModel, recursive, processPlugins, resolveDependencies );
+                    path,
+                    source,
+                    artifact,
+                    coordinate,
+                    allowStubModel,
+                    recursive,
+                    processPlugins,
+                    resolveDependencies);
         }
 
-        private static class DefaultProjectBuilderRequest extends BaseRequest
+        private static class DefaultProjectBuilderRequest extends BaseRequest implements ProjectBuilderRequest {
-            implements ProjectBuilderRequest
-        {
             private final Path path;
             private final Source source;
             private final Artifact artifact;
@@ -187,8 +173,9 @@ public interface ProjectBuilderRequest
             private final boolean processPlugins;
             private final boolean resolveDependencies;
 
-            @SuppressWarnings( "checkstyle:ParameterNumber" )
+            @SuppressWarnings("checkstyle:ParameterNumber")
-            DefaultProjectBuilderRequest( @Nonnull Session session,
+            DefaultProjectBuilderRequest(
+                    @Nonnull Session session,
                     @Nullable Path path,
                     @Nullable Source source,
                     @Nullable Artifact artifact,
@@ -196,9 +183,8 @@ public interface ProjectBuilderRequest
                     boolean allowStubModel,
                     boolean recursive,
                     boolean processPlugins,
-                                          boolean resolveDependencies )
+                    boolean resolveDependencies) {
-            {
+                super(session);
-                super( session );
                 this.path = path;
                 this.source = source;
                 this.artifact = artifact;
@@ -211,56 +197,47 @@ public interface ProjectBuilderRequest
 
             @Nonnull
             @Override
-            public Optional<Path> getPath()
+            public Optional<Path> getPath() {
-            {
+                return Optional.ofNullable(path);
-                return Optional.ofNullable( path );
             }
 
             @Nonnull
             @Override
-            public Optional<Source> getSource()
+            public Optional<Source> getSource() {
-            {
+                return Optional.ofNullable(source);
-                return Optional.ofNullable( source );
             }
 
             @Nonnull
             @Override
-            public Optional<Artifact> getArtifact()
+            public Optional<Artifact> getArtifact() {
-            {
+                return Optional.ofNullable(artifact);
-                return Optional.ofNullable( artifact );
             }
 
             @Nonnull
             @Override
-            public Optional<ArtifactCoordinate> getCoordinate()
+            public Optional<ArtifactCoordinate> getCoordinate() {
-            {
+                return Optional.ofNullable(coordinate);
-                return Optional.ofNullable( coordinate );
             }
 
             @Override
-            public boolean isAllowStubModel()
+            public boolean isAllowStubModel() {
-            {
                 return allowStubModel;
             }
 
             @Override
-            public boolean isRecursive()
+            public boolean isRecursive() {
-            {
                 return recursive;
             }
 
             @Override
-            public boolean isProcessPlugins()
+            public boolean isProcessPlugins() {
-            {
                 return processPlugins;
             }
 
             @Override
-            public boolean isResolveDependencies()
+            public boolean isResolveDependencies() {
-            {
                 return resolveDependencies;
             }
         }
-
     }
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,14 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.api.services;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
 
 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;
 
 /**
  * Result of a project build call.
@@ -34,8 +31,7 @@ import org.apache.maven.api.Project;
  * @since 4.0
  */
 @Experimental
-public interface ProjectBuilderResult
+public interface ProjectBuilderResult {
-{
 
     /**
      * Gets the identifier of the project that could not be built. The general format of the identifier is {@code
@@ -79,5 +75,4 @@ public interface ProjectBuilderResult
      */
     @Nonnull
     Optional<DependencyCollectorResult> getDependencyResolverResult();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,22 +16,21 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
-
+package org.apache.maven.api.services;
-import org.apache.maven.api.Service;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
 
 import java.nio.file.Path;
 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;
 import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.ResolutionScope;
+import org.apache.maven.api.Service;
 import org.apache.maven.api.Session;
+import org.apache.maven.api.annotations.Experimental;
+import org.apache.maven.api.annotations.Nonnull;
 
 /**
  * Interface to manage the project during its lifecycle.
@@ -41,8 +38,7 @@ import org.apache.maven.api.Session;
  * @since 4.0
  */
 @Experimental
-public interface ProjectManager extends Service
+public interface ProjectManager extends Service {
-{
     /**
      * Returns the path to the resolved file in the local repository
      * if the artifact has been resolved.
@@ -50,44 +46,41 @@ public interface ProjectManager extends Service
      * @return the path of the resolved artifact
      */
     @Nonnull
-    Optional<Path> getPath( Project project );
+    Optional<Path> getPath(Project project);
 
     @Nonnull
-    Collection<Artifact> getAttachedArtifacts( Project project );
+    Collection<Artifact> getAttachedArtifacts(Project project);
 
-    default void attachArtifact( Session session, Project project, Path path )
+    default void attachArtifact(Session session, Project project, Path path) {
-    {
         String name = path.getFileName().toString();
-        int dot = name.lastIndexOf( '.' );
+        int dot = name.lastIndexOf('.');
-        String ext = dot >= 1 ? name.substring( dot + 1 ) : "";
+        String ext = dot >= 1 ? name.substring(dot + 1) : "";
-        Artifact artifact = session.createArtifact( project.getGroupId(), project.getArtifactId(),
+        Artifact artifact =
-                project.getVersion(), ext );
+                session.createArtifact(project.getGroupId(), project.getArtifactId(), project.getVersion(), ext);
-        attachArtifact( project, artifact, path );
+        attachArtifact(project, artifact, path);
     }
 
-    default void attachArtifact( Session session, Project project, String type, Path path )
+    default void attachArtifact(Session session, Project project, String type, Path path) {
-    {
+        Artifact artifact = session.createArtifact(
-        Artifact artifact = session.createArtifact( project.getGroupId(), project.getArtifactId(),
+                project.getGroupId(), project.getArtifactId(), project.getVersion(), null, null, type);
-                                                    project.getVersion(), null, null, type );
+        attachArtifact(project, artifact, path);
-        attachArtifact( project, artifact, path );
     }
 
-    void attachArtifact( Project project, Artifact artifact, Path path );
+    void attachArtifact(Project project, Artifact artifact, Path path);
 
-    List<String> getCompileSourceRoots( Project project );
+    List<String> getCompileSourceRoots(Project project);
 
-    void addCompileSourceRoot( Project project, String sourceRoot );
+    void addCompileSourceRoot(Project project, String sourceRoot);
 
-    List<String> getTestCompileSourceRoots( Project project );
+    List<String> getTestCompileSourceRoots(Project project);
 
-    void addTestCompileSourceRoot( Project project, String sourceRoot );
+    void addTestCompileSourceRoot(Project project, String sourceRoot);
 
-    List<RemoteRepository> getRepositories( Project project );
+    List<RemoteRepository> getRepositories(Project project);
 
-    List<Artifact> getResolvedDependencies( Project project, ResolutionScope scope );
+    List<Artifact> getResolvedDependencies(Project project, ResolutionScope scope);
 
-    Node getCollectedDependencies( Project project, ResolutionScope scope );
+    Node getCollectedDependencies(Project project, ResolutionScope scope);
-
-    void setProperty( Project project, String key, String value );
 
+    void setProperty(Project project, String key, String value);
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/Prompter.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import java.util.List;
-
 import org.apache.maven.api.Service;
 import org.apache.maven.api.annotations.Experimental;
 
@@ -30,8 +28,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public interface Prompter extends Service
+public interface Prompter extends Service {
-{
     /**
      * Prompts the user for a string.
      *
@@ -39,10 +36,8 @@ public interface Prompter extends Service
      * @return the string entered by the user
      * @throws PrompterException if an exception occurs
      */
-    default String prompt( String message )
+    default String prompt(String message) throws PrompterException {
-            throws PrompterException
+        return prompt(message, null, null);
-    {
-        return prompt( message, null, null );
     }
 
     /**
@@ -53,10 +48,8 @@ public interface Prompter extends Service
      * @return the string entered by the user
      * @throws PrompterException if an exception occurs
      */
-    default String prompt( String message, String defaultReply )
+    default String prompt(String message, String defaultReply) throws PrompterException {
-            throws PrompterException
+        return prompt(message, null, defaultReply);
-    {
-        return prompt( message, null, defaultReply );
     }
 
     /**
@@ -67,10 +60,8 @@ public interface Prompter extends Service
      * @return the string entered by the user
      * @throws PrompterException if an exception occurs
      */
-    default String prompt( String message, List<String> possibleValues )
+    default String prompt(String message, List<String> possibleValues) throws PrompterException {
-            throws PrompterException
+        return prompt(message, possibleValues, null);
-    {
-        return prompt( message, possibleValues, null );
     }
 
     /**
@@ -82,8 +73,7 @@ public interface Prompter extends Service
      * @return the string entered by the user
      * @throws PrompterException if an exception occurs
      */
-    String prompt( String message, List<String> possibleValues, String defaultReply )
+    String prompt(String message, List<String> possibleValues, String defaultReply) throws PrompterException;
-            throws PrompterException;
 
     /**
      * Prompts the user for a password.
@@ -92,8 +82,7 @@ public interface Prompter extends Service
      * @return the password entered by the user
      * @throws PrompterException if an exception occurs
      */
-    String promptForPassword( String message )
+    String promptForPassword(String message) throws PrompterException;
-            throws PrompterException;
 
     /**
      * Displays a message to the user.
@@ -101,6 +90,5 @@ public interface Prompter extends Service
      * @param message the message to display
      * @throws PrompterException if an exception occurs
      */
-    void showMessage( String message )
+    void showMessage(String message) throws PrompterException;
-            throws PrompterException;
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/PrompterException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,16 +26,12 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class PrompterException
+public class PrompterException extends MavenException {
-    extends MavenException
-{
     /**
      * @param message the message to give
      * @param e the {@link Exception}
      */
-    public PrompterException( String message, Exception e )
+    public PrompterException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/RepositoryFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import java.nio.file.Path;
-
 import org.apache.maven.api.LocalRepository;
 import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.Service;
@@ -34,16 +32,14 @@ import org.apache.maven.api.model.Repository;
  * @since 4.0
  */
 @Experimental
-public interface RepositoryFactory extends Service
+public interface RepositoryFactory extends Service {
-{
 
     @Nonnull
-    LocalRepository createLocal( @Nonnull Path path );
+    LocalRepository createLocal(@Nonnull Path path);
 
     @Nonnull
-    RemoteRepository createRemote( @Nonnull String id, @Nonnull String url );
+    RemoteRepository createRemote(@Nonnull String id, @Nonnull String url);
 
     @Nonnull
-    RemoteRepository createRemote( @Nonnull Repository repository );
+    RemoteRepository createRemote(@Nonnull Repository repository);
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilder.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import java.nio.file.Path;
-
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Nonnull;
@@ -28,8 +26,7 @@ import org.apache.maven.api.annotations.Nonnull;
 /**
  * Builds the effective settings from a user settings file and/or a global settings file.
  */
-public interface SettingsBuilder extends Service
+public interface SettingsBuilder extends Service {
-{
 
     /**
      * Builds the effective settings of the specified settings files.
@@ -39,7 +36,7 @@ public interface SettingsBuilder extends Service
      * @throws SettingsBuilderException if the effective settings could not be built
      */
     @Nonnull
-    SettingsBuilderResult build( @Nonnull SettingsBuilderRequest request );
+    SettingsBuilderResult build(@Nonnull SettingsBuilderRequest request);
 
     /**
      * Builds the effective settings of the specified settings sources.
@@ -48,11 +45,9 @@ public interface SettingsBuilder extends Service
      * @throws SettingsBuilderException if the effective settings could not be built
      */
     @Nonnull
-    default SettingsBuilderResult build( @Nonnull Session session,
+    default SettingsBuilderResult build(
-                                         @Nonnull Source globalSettingsSource,
+            @Nonnull Session session, @Nonnull Source globalSettingsSource, @Nonnull Source userSettingsSource) {
-                                         @Nonnull Source userSettingsSource )
+        return build(SettingsBuilderRequest.build(session, globalSettingsSource, userSettingsSource));
-    {
-        return build( SettingsBuilderRequest.build( session, globalSettingsSource, userSettingsSource ) );
     }
 
     /**
@@ -62,10 +57,8 @@ public interface SettingsBuilder extends Service
      * @throws SettingsBuilderException if the effective settings could not be built
      */
     @Nonnull
-    default SettingsBuilderResult build( @Nonnull Session session,
+    default SettingsBuilderResult build(
-                                         @Nonnull Path globalSettingsPath,
+            @Nonnull Session session, @Nonnull Path globalSettingsPath, @Nonnull Path userSettingsPath) {
-                                         @Nonnull Path userSettingsPath )
+        return build(SettingsBuilderRequest.build(session, globalSettingsPath, userSettingsPath));
-    {
-        return build( SettingsBuilderRequest.build( session, globalSettingsPath, userSettingsPath ) );
     }
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,16 +26,13 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class SettingsBuilderException
+public class SettingsBuilderException extends MavenException {
-    extends MavenException
-{
     /**
      * @param message the message to give
      * @param e the {@link Exception}
      */
-    public SettingsBuilderException( String message, Exception e )
+    public SettingsBuilderException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
 
     // TODO: add SettingsBuilderResult

api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,10 +16,12 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
@@ -29,15 +29,12 @@ import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 import org.apache.maven.api.annotations.Nullable;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 /**
  * Collects settings that control the building of effective settings.
  */
 @Experimental
 @Immutable
-public interface SettingsBuilderRequest
+public interface SettingsBuilderRequest {
-{
 
     @Nonnull
     Session getSession();
@@ -75,97 +72,82 @@ public interface SettingsBuilderRequest
     Optional<Source> getUserSettingsSource();
 
     @Nonnull
-    static SettingsBuilderRequest build( @Nonnull Session session,
+    static SettingsBuilderRequest build(
-                                         @Nonnull Source globalSettingsSource,
+            @Nonnull Session session, @Nonnull Source globalSettingsSource, @Nonnull Source userSettingsSource) {
-                                         @Nonnull Source userSettingsSource )
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .globalSettingsSource( nonNull( globalSettingsSource, "globalSettingsSource cannot be null" ) )
+                .globalSettingsSource(nonNull(globalSettingsSource, "globalSettingsSource cannot be null"))
-                .userSettingsSource( nonNull( userSettingsSource, "userSettingsSource cannot be null" ) )
+                .userSettingsSource(nonNull(userSettingsSource, "userSettingsSource cannot be null"))
                 .build();
     }
 
     @Nonnull
-    static SettingsBuilderRequest build( @Nonnull Session session,
+    static SettingsBuilderRequest build(
-                                         @Nonnull Path globalSettingsPath,
+            @Nonnull Session session, @Nonnull Path globalSettingsPath, @Nonnull Path userSettingsPath) {
-                                         @Nonnull Path userSettingsPath )
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .globalSettingsPath( nonNull( globalSettingsPath, "globalSettingsPath cannot be null" ) )
+                .globalSettingsPath(nonNull(globalSettingsPath, "globalSettingsPath cannot be null"))
-                .userSettingsPath( nonNull( userSettingsPath, "userSettingsPath cannot be null" ) )
+                .userSettingsPath(nonNull(userSettingsPath, "userSettingsPath cannot be null"))
                 .build();
     }
 
     @Nonnull
-    static SettingsBuilderRequestBuilder builder()
+    static SettingsBuilderRequestBuilder builder() {
-    {
         return new SettingsBuilderRequestBuilder();
     }
 
     @NotThreadSafe
-    class SettingsBuilderRequestBuilder
+    class SettingsBuilderRequestBuilder {
-    {
         Session session;
         Path globalSettingsPath;
         Source globalSettingsSource;
         Path userSettingsPath;
         Source userSettingsSource;
 
-        public SettingsBuilderRequestBuilder session( Session session )
+        public SettingsBuilderRequestBuilder session(Session session) {
-        {
             this.session = session;
             return this;
         }
 
-        public SettingsBuilderRequestBuilder globalSettingsPath( Path globalSettingsPath )
+        public SettingsBuilderRequestBuilder globalSettingsPath(Path globalSettingsPath) {
-        {
             this.globalSettingsPath = globalSettingsPath;
             return this;
         }
 
-        public SettingsBuilderRequestBuilder globalSettingsSource( Source globalSettingsSource )
+        public SettingsBuilderRequestBuilder globalSettingsSource(Source globalSettingsSource) {
-        {
             this.globalSettingsSource = globalSettingsSource;
             return this;
         }
 
-        public SettingsBuilderRequestBuilder userSettingsPath( Path userSettingsPath )
+        public SettingsBuilderRequestBuilder userSettingsPath(Path userSettingsPath) {
-        {
             this.userSettingsPath = userSettingsPath;
             return this;
         }
 
-        public SettingsBuilderRequestBuilder userSettingsSource( Source userSettingsSource )
+        public SettingsBuilderRequestBuilder userSettingsSource(Source userSettingsSource) {
-        {
             this.userSettingsSource = userSettingsSource;
             return this;
         }
 
-        public SettingsBuilderRequest build()
+        public SettingsBuilderRequest build() {
-        {
+            return new DefaultSettingsBuilderRequest(
-            return new DefaultSettingsBuilderRequest( session,
+                    session, globalSettingsPath, globalSettingsSource, userSettingsPath, userSettingsSource);
-                    globalSettingsPath, globalSettingsSource,
-                    userSettingsPath, userSettingsSource );
         }
 
-        private static class DefaultSettingsBuilderRequest extends BaseRequest
+        private static class DefaultSettingsBuilderRequest extends BaseRequest implements SettingsBuilderRequest {
-                implements SettingsBuilderRequest
-        {
             private final Path globalSettingsPath;
             private final Source globalSettingsSource;
             private final Path userSettingsPath;
             private final Source userSettingsSource;
 
-            @SuppressWarnings( "checkstyle:ParameterNumber" )
+            @SuppressWarnings("checkstyle:ParameterNumber")
-            DefaultSettingsBuilderRequest( @Nonnull Session session,
+            DefaultSettingsBuilderRequest(
+                    @Nonnull Session session,
                     @Nullable Path globalSettingsPath,
                     @Nullable Source globalSettingsSource,
                     @Nullable Path userSettingsPath,
-                                           @Nullable Source userSettingsSource )
+                    @Nullable Source userSettingsSource) {
-            {
+                super(session);
-                super( session );
                 this.globalSettingsPath = globalSettingsPath;
                 this.globalSettingsSource = globalSettingsSource;
                 this.userSettingsPath = userSettingsPath;
@@ -174,30 +156,26 @@ public interface SettingsBuilderRequest
 
             @Nonnull
             @Override
-            public Optional<Path> getGlobalSettingsPath()
+            public Optional<Path> getGlobalSettingsPath() {
-            {
+                return Optional.ofNullable(globalSettingsPath);
-                return Optional.ofNullable( globalSettingsPath );
             }
 
             @Nonnull
             @Override
-            public Optional<Source> getGlobalSettingsSource()
+            public Optional<Source> getGlobalSettingsSource() {
-            {
+                return Optional.ofNullable(globalSettingsSource);
-                return Optional.ofNullable( globalSettingsSource );
             }
 
             @Nonnull
             @Override
-            public Optional<Path> getUserSettingsPath()
+            public Optional<Path> getUserSettingsPath() {
-            {
+                return Optional.ofNullable(userSettingsPath);
-                return Optional.ofNullable( userSettingsPath );
             }
 
             @Nonnull
             @Override
-            public Optional<Source> getUserSettingsSource()
+            public Optional<Source> getUserSettingsSource() {
-            {
+                return Optional.ofNullable(userSettingsSource);
-                return Optional.ofNullable( userSettingsSource );
             }
         }
     }

api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderResult.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,14 +16,13 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import java.util.List;
-
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.settings.Settings;
 
-public interface SettingsBuilderResult
+public interface SettingsBuilderResult {
-{
 
     /**
      * Gets the assembled settings.
@@ -44,5 +41,4 @@ public interface SettingsBuilderResult
      */
     @Nonnull
     List<BuilderProblem> getProblems();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/Source.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,10 +16,10 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import java.io.IOException;
 import java.io.InputStream;
-
 import org.apache.maven.api.annotations.Experimental;
 
 /**
@@ -30,8 +28,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public interface Source
+public interface Source {
-{
     InputStream getInputStream() throws IOException;
 
     String getLocation();

api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Consumer;
 import org.apache.maven.api.annotations.Experimental;
@@ -27,7 +26,6 @@ import org.apache.maven.api.annotations.Experimental;
  */
 @Experimental
 @Consumer
-public interface ToolchainFactory
+public interface ToolchainFactory {
-{
     // TODO: implement ToolchainFactory
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainManager.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,11 +16,11 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.Toolchain;
@@ -35,8 +33,7 @@ import org.apache.maven.api.annotations.Nonnull;
  * @since 4.0
  */
 @Experimental
-public interface ToolchainManager extends Service
+public interface ToolchainManager extends Service {
-{
 
     /**
      *
@@ -47,7 +44,7 @@ public interface ToolchainManager extends Service
      * @throws ToolchainManagerException if an exception occurs
      */
     @Nonnull
-    List<Toolchain> getToolchains( @Nonnull Session session, String type, Map<String, String> requirements );
+    List<Toolchain> getToolchains(@Nonnull Session session, String type, Map<String, String> requirements);
 
     /**
      *
@@ -57,7 +54,7 @@ public interface ToolchainManager extends Service
      * @throws ToolchainManagerException if an exception occurs
      */
     @Nonnull
-    Optional<Toolchain> getToolchainFromBuildContext( @Nonnull Session session, String type )
+    Optional<Toolchain> getToolchainFromBuildContext(@Nonnull Session session, String type)
             throws ToolchainManagerException;
 
     /**
@@ -68,8 +65,7 @@ public interface ToolchainManager extends Service
      * @throws ToolchainManagerException if an exception occurs
      */
     @Nonnull
-    List<Toolchain> getToolchainsForType( @Nonnull Session session, String type )
+    List<Toolchain> getToolchainsForType(@Nonnull Session session, String type) throws ToolchainManagerException;
-            throws ToolchainManagerException;
 
     /**
      *
@@ -77,6 +73,5 @@ public interface ToolchainManager extends Service
      * @param toolchain
      * @throws ToolchainManagerException if an exception occurs
      */
-    void storeToolchainToBuildContext( @Nonnull Session session, Toolchain toolchain )
+    void storeToolchainToBuildContext(@Nonnull Session session, Toolchain toolchain) throws ToolchainManagerException;
-            throws ToolchainManagerException;
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainManagerException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,16 +26,12 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class ToolchainManagerException
+public class ToolchainManagerException extends MavenException {
-    extends MavenException
-{
     /**
      * @param message the message to give
      * @param e the {@link Exception}
      */
-    public ToolchainManagerException( String message, Exception e )
+    public ToolchainManagerException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilder.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.Service;
 import org.apache.maven.api.annotations.Experimental;
@@ -26,9 +25,7 @@ import org.apache.maven.api.annotations.Experimental;
  * Builds the effective toolchains from a user toolchains file and/or a global toolchains file.
  */
 @Experimental
-
+public interface ToolchainsBuilder extends Service {
-public interface ToolchainsBuilder extends Service
-{
 
     /**
      * Builds the effective toolchains of the specified toolchains files.
@@ -37,6 +34,5 @@ public interface ToolchainsBuilder extends Service
      * @return the result of the toolchains building, never {@code null}
      * @throws ToolchainsBuilderException if the effective toolchains could not be built
      */
-    ToolchainsBuilderResult build( ToolchainsBuilderRequest request );
+    ToolchainsBuilderResult build(ToolchainsBuilderRequest request);
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,16 +26,13 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class ToolchainsBuilderException
+public class ToolchainsBuilderException extends MavenException {
-    extends MavenException
-{
     /**
      * @param message the message to give
      * @param e the {@link Exception}
      */
-    public ToolchainsBuilderException( String message, Exception e )
+    public ToolchainsBuilderException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
 
     // TODO: add ToolchainsBuilderResult

api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,19 +16,18 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+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.Session;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 import org.apache.maven.api.annotations.Nullable;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
+public interface ToolchainsBuilderRequest {
-
-public interface ToolchainsBuilderRequest
-{
     @Nonnull
     Session getSession();
 
@@ -67,97 +64,82 @@ public interface ToolchainsBuilderRequest
     Optional<Source> getUserToolchainsSource();
 
     @Nonnull
-    static ToolchainsBuilderRequest build( @Nonnull Session session,
+    static ToolchainsBuilderRequest build(
-                                         @Nonnull Source globalToolchainsSource,
+            @Nonnull Session session, @Nonnull Source globalToolchainsSource, @Nonnull Source userToolchainsSource) {
-                                         @Nonnull Source userToolchainsSource )
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .globalToolchainsSource( nonNull( globalToolchainsSource, "globalToolchainsSource cannot be null" ) )
+                .globalToolchainsSource(nonNull(globalToolchainsSource, "globalToolchainsSource cannot be null"))
-                .userToolchainsSource( nonNull( userToolchainsSource, "userToolchainsSource cannot be null" ) )
+                .userToolchainsSource(nonNull(userToolchainsSource, "userToolchainsSource cannot be null"))
                 .build();
     }
 
     @Nonnull
-    static ToolchainsBuilderRequest build( @Nonnull Session session,
+    static ToolchainsBuilderRequest build(
-                                         @Nonnull Path globalToolchainsPath,
+            @Nonnull Session session, @Nonnull Path globalToolchainsPath, @Nonnull Path userToolchainsPath) {
-                                         @Nonnull Path userToolchainsPath )
-    {
         return builder()
-                .session( nonNull( session, "session cannot be null" ) )
+                .session(nonNull(session, "session cannot be null"))
-                .globalToolchainsPath( nonNull( globalToolchainsPath, "globalToolchainsPath cannot be null" ) )
+                .globalToolchainsPath(nonNull(globalToolchainsPath, "globalToolchainsPath cannot be null"))
-                .userToolchainsPath( nonNull( userToolchainsPath, "userToolchainsPath cannot be null" ) )
+                .userToolchainsPath(nonNull(userToolchainsPath, "userToolchainsPath cannot be null"))
                 .build();
     }
 
     @Nonnull
-    static ToolchainsBuilderRequestBuilder builder()
+    static ToolchainsBuilderRequestBuilder builder() {
-    {
         return new ToolchainsBuilderRequestBuilder();
     }
 
     @NotThreadSafe
-    class ToolchainsBuilderRequestBuilder
+    class ToolchainsBuilderRequestBuilder {
-    {
         Session session;
         Path globalToolchainsPath;
         Source globalToolchainsSource;
         Path userToolchainsPath;
         Source userToolchainsSource;
 
-        public ToolchainsBuilderRequestBuilder session( Session session )
+        public ToolchainsBuilderRequestBuilder session(Session session) {
-        {
             this.session = session;
             return this;
         }
 
-        public ToolchainsBuilderRequestBuilder globalToolchainsPath( Path globalToolchainsPath )
+        public ToolchainsBuilderRequestBuilder globalToolchainsPath(Path globalToolchainsPath) {
-        {
             this.globalToolchainsPath = globalToolchainsPath;
             return this;
         }
 
-        public ToolchainsBuilderRequestBuilder globalToolchainsSource( Source globalToolchainsSource )
+        public ToolchainsBuilderRequestBuilder globalToolchainsSource(Source globalToolchainsSource) {
-        {
             this.globalToolchainsSource = globalToolchainsSource;
             return this;
         }
 
-        public ToolchainsBuilderRequestBuilder userToolchainsPath( Path userToolchainsPath )
+        public ToolchainsBuilderRequestBuilder userToolchainsPath(Path userToolchainsPath) {
-        {
             this.userToolchainsPath = userToolchainsPath;
             return this;
         }
 
-        public ToolchainsBuilderRequestBuilder userToolchainsSource( Source userToolchainsSource )
+        public ToolchainsBuilderRequestBuilder userToolchainsSource(Source userToolchainsSource) {
-        {
             this.userToolchainsSource = userToolchainsSource;
             return this;
         }
 
-        public ToolchainsBuilderRequest build()
+        public ToolchainsBuilderRequest build() {
-        {
+            return new ToolchainsBuilderRequestBuilder.DefaultToolchainsBuilderRequest(
-            return new ToolchainsBuilderRequestBuilder.DefaultToolchainsBuilderRequest( session,
+                    session, globalToolchainsPath, globalToolchainsSource, userToolchainsPath, userToolchainsSource);
-                    globalToolchainsPath, globalToolchainsSource,
-                    userToolchainsPath, userToolchainsSource );
         }
 
-        private static class DefaultToolchainsBuilderRequest extends BaseRequest
+        private static class DefaultToolchainsBuilderRequest extends BaseRequest implements ToolchainsBuilderRequest {
-                implements ToolchainsBuilderRequest
-        {
             private final Path globalToolchainsPath;
             private final Source globalToolchainsSource;
             private final Path userToolchainsPath;
             private final Source userToolchainsSource;
 
-            @SuppressWarnings( "checkstyle:ParameterNumber" )
+            @SuppressWarnings("checkstyle:ParameterNumber")
-            DefaultToolchainsBuilderRequest( @Nonnull Session session,
+            DefaultToolchainsBuilderRequest(
+                    @Nonnull Session session,
                     @Nullable Path globalToolchainsPath,
                     @Nullable Source globalToolchainsSource,
                     @Nullable Path userToolchainsPath,
-                                             @Nullable Source userToolchainsSource )
+                    @Nullable Source userToolchainsSource) {
-            {
+                super(session);
-                super( session );
                 this.globalToolchainsPath = globalToolchainsPath;
                 this.globalToolchainsSource = globalToolchainsSource;
                 this.userToolchainsPath = userToolchainsPath;
@@ -166,30 +148,26 @@ public interface ToolchainsBuilderRequest
 
             @Nonnull
             @Override
-            public Optional<Path> getGlobalToolchainsPath()
+            public Optional<Path> getGlobalToolchainsPath() {
-            {
+                return Optional.ofNullable(globalToolchainsPath);
-                return Optional.ofNullable( globalToolchainsPath );
             }
 
             @Nonnull
             @Override
-            public Optional<Source> getGlobalToolchainsSource()
+            public Optional<Source> getGlobalToolchainsSource() {
-            {
+                return Optional.ofNullable(globalToolchainsSource);
-                return Optional.ofNullable( globalToolchainsSource );
             }
 
             @Nonnull
             @Override
-            public Optional<Path> getUserToolchainsPath()
+            public Optional<Path> getUserToolchainsPath() {
-            {
+                return Optional.ofNullable(userToolchainsPath);
-                return Optional.ofNullable( userToolchainsPath );
             }
 
             @Nonnull
             @Override
-            public Optional<Source> getUserToolchainsSource()
+            public Optional<Source> getUserToolchainsSource() {
-            {
+                return Optional.ofNullable(userToolchainsSource);
-                return Optional.ofNullable( userToolchainsSource );
             }
         }
     }

api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderResult.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,14 +16,13 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import java.util.List;
-
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.toolchain.PersistedToolchains;
 
-public interface ToolchainsBuilderResult
+public interface ToolchainsBuilderResult {
-{
     /**
      * Gets the assembled toolchains.
      *
@@ -43,5 +40,4 @@ public interface ToolchainsBuilderResult
      */
     @Nonnull
     List<BuilderProblem> getProblems();
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/TypeRegistry.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Type;
@@ -30,8 +29,7 @@ import org.apache.maven.api.annotations.Nonnull;
  * @since 4.0
  */
 @Experimental
-public interface TypeRegistry extends Service
+public interface TypeRegistry extends Service {
-{
 
     /**
      * Obtain the {@link Type} from the specified {@code id}.
@@ -42,6 +40,5 @@ public interface TypeRegistry extends Service
      * @return the type
      */
     @Nonnull
-    Type getType( @Nonnull String id );
+    Type getType(@Nonnull String id);
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/VersionParser.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Version;
@@ -31,8 +30,7 @@ import org.apache.maven.api.annotations.Nonnull;
  * @since 4.0
  */
 @Experimental
-public interface VersionParser extends Service
+public interface VersionParser extends Service {
-{
     /**
      * Parses the specified version string, for example "1.0".
      *
@@ -42,7 +40,7 @@ public interface VersionParser extends Service
      * @see org.apache.maven.api.Session#parseVersion(String)
      */
     @Nonnull
-    Version parseVersion( @Nonnull String version );
+    Version parseVersion(@Nonnull String version);
 
     /**
      * Parses the specified version range specification, for example "[1.0,2.0)".
@@ -52,11 +50,10 @@ public interface VersionParser extends Service
      * @throws VersionParserException if the range specification violates the syntax rules of this scheme
      */
     @Nonnull
-    VersionRange parseVersionRange( @Nonnull String range );
+    VersionRange parseVersionRange(@Nonnull String range);
 
     /**
      * Checks whether a given artifact version is considered a {@code SNAPSHOT} or not.
      */
-    boolean isSnapshot( @Nonnull String version );
+    boolean isSnapshot(@Nonnull String version);
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/VersionParserException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services;
 
 import org.apache.maven.api.annotations.Experimental;
 
@@ -27,16 +26,12 @@ import org.apache.maven.api.annotations.Experimental;
  * @since 4.0
  */
 @Experimental
-public class VersionParserException
+public class VersionParserException extends MavenException {
-    extends MavenException
-{
     /**
      * @param message the message to give
      * @param e the {@link Exception}
      */
-    public VersionParserException( String message, Exception e )
+    public VersionParserException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/ModelXmlFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services.xml;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.model.Model;
@@ -28,7 +27,4 @@ import org.apache.maven.api.model.Model;
  * @since 4.0
  */
 @Experimental
-public interface ModelXmlFactory extends XmlFactory<Model>
+public interface ModelXmlFactory extends XmlFactory<Model> {}
-{
-
-}

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/SettingsXmlFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services.xml;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.settings.Settings;
@@ -28,7 +27,4 @@ import org.apache.maven.api.settings.Settings;
  * @since 4.0
  */
 @Experimental
-public interface SettingsXmlFactory extends XmlFactory<Settings>
+public interface SettingsXmlFactory extends XmlFactory<Settings> {}
-{
-
-}

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/ToolchainsXmlFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services.xml;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.toolchain.PersistedToolchains;
@@ -28,7 +27,4 @@ import org.apache.maven.api.toolchain.PersistedToolchains;
  * @since 4.0
  */
 @Experimental
-public interface ToolchainsXmlFactory extends XmlFactory<PersistedToolchains>
+public interface ToolchainsXmlFactory extends XmlFactory<PersistedToolchains> {}
-{
-
-}

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services.xml;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -26,10 +25,9 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.nio.file.Path;
-
+import org.apache.maven.api.Service;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
-import org.apache.maven.api.Service;
 
 /**
  * Generic interface to read/write objects to/from XML.
@@ -38,64 +36,57 @@ import org.apache.maven.api.Service;
  * @since 4.0
  */
 @Experimental
-public interface XmlFactory<T> extends Service
+public interface XmlFactory<T> extends Service {
-{
 
     @Nonnull
-    default T read( @Nonnull Path path ) throws XmlReaderException
+    default T read(@Nonnull Path path) throws XmlReaderException {
-    {
+        return read(path, true);
-        return read( path, true );
     }
 
     @Nonnull
-    default T read( @Nonnull Path path, boolean strict ) throws XmlReaderException
+    default T read(@Nonnull Path path, boolean strict) throws XmlReaderException {
-    {
+        return read(XmlReaderRequest.builder().path(path).strict(strict).build());
-        return read( XmlReaderRequest.builder().path( path ).strict( strict ).build() );
     }
 
     @Nonnull
-    default T read( @Nonnull InputStream input ) throws XmlReaderException
+    default T read(@Nonnull InputStream input) throws XmlReaderException {
-    {
+        return read(input, true);
-        return read( input, true );
     }
 
     @Nonnull
-    default T read( @Nonnull InputStream input, boolean strict ) throws XmlReaderException
+    default T read(@Nonnull InputStream input, boolean strict) throws XmlReaderException {
-    {
+        return read(XmlReaderRequest.builder().inputStream(input).strict(strict).build());
-        return read( XmlReaderRequest.builder().inputStream( input ).strict( strict ).build() );
     }
 
     @Nonnull
-    default T read( @Nonnull Reader reader ) throws XmlReaderException
+    default T read(@Nonnull Reader reader) throws XmlReaderException {
-    {
+        return read(reader, true);
-        return read( reader, true );
     }
 
     @Nonnull
-    default T read( @Nonnull Reader reader, boolean strict ) throws XmlReaderException
+    default T read(@Nonnull Reader reader, boolean strict) throws XmlReaderException {
-    {
+        return read(XmlReaderRequest.builder().reader(reader).strict(strict).build());
-        return read( XmlReaderRequest.builder().reader( reader ).strict( strict ).build() );
     }
 
     @Nonnull
-    T read( @Nonnull XmlReaderRequest request ) throws XmlReaderException;
+    T read(@Nonnull XmlReaderRequest request) throws XmlReaderException;
 
-    default void write( @Nonnull T content, @Nonnull Path path ) throws XmlWriterException
+    default void write(@Nonnull T content, @Nonnull Path path) throws XmlWriterException {
-    {
+        write(XmlWriterRequest.<T>builder().content(content).path(path).build());
-        write( XmlWriterRequest.<T>builder().content( content ).path( path ).build() );
     }
 
-    default void write( @Nonnull T content, @Nonnull OutputStream outputStream ) throws XmlWriterException
+    default void write(@Nonnull T content, @Nonnull OutputStream outputStream) throws XmlWriterException {
-    {
+        write(XmlWriterRequest.<T>builder()
-        write( XmlWriterRequest.<T>builder().content( content ).outputStream( outputStream ).build() );
+                .content(content)
+                .outputStream(outputStream)
+                .build());
     }
 
-    default void write( @Nonnull T content, @Nonnull Writer writer ) throws XmlWriterException
+    default void write(@Nonnull T content, @Nonnull Writer writer) throws XmlWriterException {
-    {
+        write(XmlWriterRequest.<T>builder().content(content).writer(writer).build());
-        write( XmlWriterRequest.<T>builder().content( content ).writer( writer ).build() );
     }
 
-    void write( @Nonnull XmlWriterRequest<T> request ) throws XmlWriterException;
+    void write(@Nonnull XmlWriterRequest<T> request) throws XmlWriterException;
 
     /**
      * Simply parse the given xml string.
@@ -105,9 +96,8 @@ public interface XmlFactory<T> extends Service
      * @throws XmlReaderException if an error occurs during the parsing
      * @see #toXmlString(Object)
      */
-    default T fromXmlString( @Nonnull String xml ) throws XmlReaderException
+    default T fromXmlString(@Nonnull String xml) throws XmlReaderException {
-    {
+        return read(new StringReader(xml));
-        return read( new StringReader( xml ) );
     }
 
     /**
@@ -118,11 +108,9 @@ public interface XmlFactory<T> extends Service
      * @throws XmlWriterException if an error occurs during the transformation
      * @see #fromXmlString(String)
      */
-    default String toXmlString( @Nonnull T content ) throws XmlWriterException
+    default String toXmlString(@Nonnull T content) throws XmlWriterException {
-    {
         StringWriter sw = new StringWriter();
-        write( content, sw );
+        write(content, sw);
         return sw.toString();
     }
-    
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services.xml;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.services.MavenException;
@@ -28,17 +27,13 @@ import org.apache.maven.api.services.MavenException;
  * @since 4.0
  */
 @Experimental
-public class XmlReaderException
+public class XmlReaderException extends MavenException {
-        extends MavenException
-{
 
     /**
      * @param message the message for the exception
      * @param e the exception itself
      */
-    public XmlReaderException( String message, Exception e )
+    public XmlReaderException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,12 +16,12 @@ package org.apache.maven.api.services.xml;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services.xml;
 
 import java.io.InputStream;
 import java.io.Reader;
 import java.net.URL;
 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;
@@ -36,8 +34,7 @@ import org.apache.maven.api.annotations.NotThreadSafe;
  */
 @Experimental
 @Immutable
-public interface XmlReaderRequest
+public interface XmlReaderRequest {
-{
 
     Path getPath();
 
@@ -57,8 +54,7 @@ public interface XmlReaderRequest
 
     boolean isAddDefaultEntities();
 
-    interface Transformer
+    interface Transformer {
-    {
         /**
          * Interpolate the value read from the xml document
          *
@@ -67,18 +63,16 @@ public interface XmlReaderRequest
          *                  log stuff.
          * @return the interpolated value
          */
-        String transform( String source, String fieldName );
+        String transform(String source, String fieldName);
     }
 
     @Nonnull
-    static XmlReaderRequestBuilder builder()
+    static XmlReaderRequestBuilder builder() {
-    {
         return new XmlReaderRequestBuilder();
     }
 
     @NotThreadSafe
-    class XmlReaderRequestBuilder
+    class XmlReaderRequestBuilder {
-    {
         Path path;
         URL url;
         InputStream inputStream;
@@ -89,68 +83,57 @@ public interface XmlReaderRequest
         String location;
         boolean addDefaultEntities = true;
 
-        public XmlReaderRequestBuilder path( Path path )
+        public XmlReaderRequestBuilder path(Path path) {
-        {
             this.path = path;
             return this;
         }
 
-        public XmlReaderRequestBuilder url( URL url )
+        public XmlReaderRequestBuilder url(URL url) {
-        {
             this.url = url;
             return this;
         }
 
-        public XmlReaderRequestBuilder inputStream( InputStream inputStream )
+        public XmlReaderRequestBuilder inputStream(InputStream inputStream) {
-        {
             this.inputStream = inputStream;
             return this;
         }
 
-        public XmlReaderRequestBuilder reader( Reader reader )
+        public XmlReaderRequestBuilder reader(Reader reader) {
-        {
             this.reader = reader;
             return this;
         }
 
-        public XmlReaderRequestBuilder transformer( Transformer transformer )
+        public XmlReaderRequestBuilder transformer(Transformer transformer) {
-        {
             this.transformer = transformer;
             return this;
         }
 
-        public XmlReaderRequestBuilder strict( boolean strict )
+        public XmlReaderRequestBuilder strict(boolean strict) {
-        {
             this.strict = strict;
             return this;
         }
 
-        public XmlReaderRequestBuilder modelId( String modelId )
+        public XmlReaderRequestBuilder modelId(String modelId) {
-        {
             this.modelId = modelId;
             return this;
         }
 
-        public XmlReaderRequestBuilder location( String location )
+        public XmlReaderRequestBuilder location(String location) {
-        {
             this.location = location;
             return this;
         }
 
-        public XmlReaderRequestBuilder addDefaultEntities( boolean addDefaultEntities )
+        public XmlReaderRequestBuilder addDefaultEntities(boolean addDefaultEntities) {
-        {
             this.addDefaultEntities = addDefaultEntities;
             return this;
         }
 
-        public XmlReaderRequest build()
+        public XmlReaderRequest build() {
-        {
+            return new DefaultXmlReaderRequest(
-            return new DefaultXmlReaderRequest( path, url, inputStream, reader, transformer, strict,
+                    path, url, inputStream, reader, transformer, strict, modelId, location, addDefaultEntities);
-                    modelId, location, addDefaultEntities );
         }
 
-        private static class DefaultXmlReaderRequest implements XmlReaderRequest
+        private static class DefaultXmlReaderRequest implements XmlReaderRequest {
-        {
             final Path path;
             final URL url;
             final InputStream inputStream;
@@ -161,12 +144,17 @@ public interface XmlReaderRequest
             final String location;
             final boolean addDefaultEntities;
 
-            @SuppressWarnings( "checkstyle:ParameterNumber" )
+            @SuppressWarnings("checkstyle:ParameterNumber")
-            DefaultXmlReaderRequest( Path path, URL url, InputStream inputStream, Reader reader,
+            DefaultXmlReaderRequest(
-                                     Transformer transformer, boolean strict,
+                    Path path,
-                                     String modelId, String location,
+                    URL url,
-                                     boolean addDefaultEntities )
+                    InputStream inputStream,
-            {
+                    Reader reader,
+                    Transformer transformer,
+                    boolean strict,
+                    String modelId,
+                    String location,
+                    boolean addDefaultEntities) {
                 this.path = path;
                 this.url = url;
                 this.inputStream = inputStream;
@@ -179,58 +167,48 @@ public interface XmlReaderRequest
             }
 
             @Override
-            public Path getPath()
+            public Path getPath() {
-            {
                 return path;
             }
 
             @Override
-            public URL getURL()
+            public URL getURL() {
-            {
                 return null;
             }
 
             @Override
-            public InputStream getInputStream()
+            public InputStream getInputStream() {
-            {
                 return inputStream;
             }
 
-            public Reader getReader()
+            public Reader getReader() {
-            {
                 return reader;
             }
 
             @Override
-            public Transformer getTransformer()
+            public Transformer getTransformer() {
-            {
                 return transformer;
             }
 
             @Override
-            public boolean isStrict()
+            public boolean isStrict() {
-            {
                 return strict;
             }
 
             @Override
-            public String getModelId()
+            public String getModelId() {
-            {
                 return modelId;
             }
 
             @Override
-            public String getLocation()
+            public String getLocation() {
-            {
                 return location;
             }
 
             @Override
-            public boolean isAddDefaultEntities()
+            public boolean isAddDefaultEntities() {
-            {
                 return addDefaultEntities;
             }
         }
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services.xml;
 
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.services.MavenException;
@@ -28,17 +27,13 @@ import org.apache.maven.api.services.MavenException;
  * @since 4.0
  */
 @Experimental
-public class XmlWriterException
+public class XmlWriterException extends MavenException {
-        extends MavenException
-{
 
     /**
      * @param message the message for the exception
      * @param e the exception itself
      */
-    public XmlWriterException( String message, Exception e )
+    public XmlWriterException(String message, Exception e) {
-    {
+        super(message, e);
-        super( message, e );
     }
-
 }

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,11 +16,11 @@ package org.apache.maven.api.services.xml;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.services.xml;
 
 import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.file.Path;
-
 import org.apache.maven.api.annotations.Experimental;
 
 /**
@@ -32,8 +30,7 @@ import org.apache.maven.api.annotations.Experimental;
  * @param <T> the object type to read
  */
 @Experimental
-public interface XmlWriterRequest<T>
+public interface XmlWriterRequest<T> {
-{
 
     Path getPath();
 
@@ -43,56 +40,47 @@ public interface XmlWriterRequest<T>
 
     T getContent();
 
-    static <T> XmlWriterRequestBuilder<T> builder()
+    static <T> XmlWriterRequestBuilder<T> builder() {
-    {
         return new XmlWriterRequestBuilder<>();
     }
 
-    class XmlWriterRequestBuilder<T>
+    class XmlWriterRequestBuilder<T> {
-    {
         Path path;
         OutputStream outputStream;
         Writer writer;
         T content;
 
-        public XmlWriterRequestBuilder<T> path( Path path )
+        public XmlWriterRequestBuilder<T> path(Path path) {
-        {
             this.path = path;
             return this;
         }
 
-        public XmlWriterRequestBuilder<T> outputStream( OutputStream outputStream )
+        public XmlWriterRequestBuilder<T> outputStream(OutputStream outputStream) {
-        {
             this.outputStream = outputStream;
             return this;
         }
 
-        public XmlWriterRequestBuilder<T> writer( Writer writer )
+        public XmlWriterRequestBuilder<T> writer(Writer writer) {
-        {
             this.writer = writer;
             return this;
         }
 
-        public XmlWriterRequestBuilder<T> content( T content )
+        public XmlWriterRequestBuilder<T> content(T content) {
-        {
             this.content = content;
             return this;
         }
 
-        public XmlWriterRequest<T> build()
+        public XmlWriterRequest<T> build() {
-        {
+            return new DefaultXmlWriterRequest<>(path, outputStream, writer, content);
-            return new DefaultXmlWriterRequest<>( path, outputStream, writer, content );
         }
 
-        private static class DefaultXmlWriterRequest<T> implements XmlWriterRequest<T>
+        private static class DefaultXmlWriterRequest<T> implements XmlWriterRequest<T> {
-        {
             final Path path;
             final OutputStream outputStream;
             final Writer writer;
             final T content;
 
-            DefaultXmlWriterRequest( Path path, OutputStream outputStream, Writer writer, T content )
+            DefaultXmlWriterRequest(Path path, OutputStream outputStream, Writer writer, T content) {
-            {
                 this.path = path;
                 this.outputStream = outputStream;
                 this.writer = writer;
@@ -100,26 +88,22 @@ public interface XmlWriterRequest<T>
             }
 
             @Override
-            public Path getPath()
+            public Path getPath() {
-            {
                 return path;
             }
 
             @Override
-            public OutputStream getOutputStream()
+            public OutputStream getOutputStream() {
-            {
                 return outputStream;
             }
 
             @Override
-            public Writer getWriter()
+            public Writer getWriter() {
-            {
                 return writer;
             }
 
             @Override
-            public T getContent()
+            public T getContent() {
-            {
                 return content;
             }
         }

api/maven-api-meta/pom.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file

api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Consumer.java

@@ -1,5 +1,3 @@
-package org.apache.maven.api.annotations;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.annotations;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.api.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -40,8 +39,6 @@ import java.lang.annotation.Target;
  */
 @Experimental
 @Documented
-@Retention( RetentionPolicy.CLASS )
+@Retention(RetentionPolicy.CLASS)
-@Target( { ElementType.TYPE, ElementType.PACKAGE } )
+@Target({ElementType.TYPE, ElementType.PACKAGE})
-public @interface Consumer
+public @interface Consumer {}
-{
-}