You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/06/15 18:34:36 UTC
[maven] branch settinsg-builder-jsr-330 created (now d372045)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch settinsg-builder-jsr-330
in repository https://gitbox.apache.org/repos/asf/maven.git.
at d372045 [MNG-5577] Convert maven-settings-builder to JSR 330
This branch includes the following new commits:
new d372045 [MNG-5577] Convert maven-settings-builder to JSR 330
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 01/01: [MNG-5577] Convert maven-settings-builder to JSR 330
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch settinsg-builder-jsr-330
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d3720456446e03a9a9ce197a29c3221fa94f9dca
Author: Joseph Walton <jo...@kafsemo.org>
AuthorDate: Sun Apr 21 21:10:45 2019 +1000
[MNG-5577] Convert maven-settings-builder to JSR 330
Use @Named and @Singleton throughout, and switch to constructor injection
for DefaultSettingsBuilder.
This closes #246
---
maven-settings-builder/pom.xml | 10 ++++-----
.../settings/building/DefaultSettingsBuilder.java | 24 +++++++++++++++-------
.../building/DefaultSettingsBuilderFactory.java | 10 +++------
.../settings/crypto/DefaultSettingsDecrypter.java | 17 ++++++++++-----
.../maven/settings/io/DefaultSettingsReader.java | 7 +++++--
.../maven/settings/io/DefaultSettingsWriter.java | 7 +++++--
.../validation/DefaultSettingsValidator.java | 7 +++++--
7 files changed, 52 insertions(+), 30 deletions(-)
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index 381f5b1..fb676ca 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -46,8 +46,8 @@ under the License.
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -55,7 +55,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -70,8 +70,8 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>sisu-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
index 3cdae7d..675ea59 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
@@ -27,6 +27,10 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import org.apache.maven.building.FileSource;
import org.apache.maven.building.Source;
import org.apache.maven.settings.Settings;
@@ -36,8 +40,6 @@ import org.apache.maven.settings.io.SettingsReader;
import org.apache.maven.settings.io.SettingsWriter;
import org.apache.maven.settings.merge.MavenSettingsMerger;
import org.apache.maven.settings.validation.SettingsValidator;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
import org.codehaus.plexus.interpolation.InterpolationException;
import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
@@ -49,21 +51,29 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
*
* @author Benjamin Bentmann
*/
-@Component( role = SettingsBuilder.class )
+@Named
+@Singleton
public class DefaultSettingsBuilder
implements SettingsBuilder
{
- @Requirement
private SettingsReader settingsReader;
- @Requirement
private SettingsWriter settingsWriter;
- @Requirement
private SettingsValidator settingsValidator;
- private MavenSettingsMerger settingsMerger = new MavenSettingsMerger();
+ private final MavenSettingsMerger settingsMerger = new MavenSettingsMerger();
+
+ @Inject
+ public DefaultSettingsBuilder( SettingsReader settingsReader,
+ SettingsWriter settingsWriter,
+ SettingsValidator settingsValidator )
+ {
+ this.settingsReader = settingsReader;
+ this.settingsWriter = settingsWriter;
+ this.settingsValidator = settingsValidator;
+ }
public DefaultSettingsBuilder setSettingsReader( SettingsReader settingsReader )
{
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
index e728ec5..805a4c8 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java
@@ -59,13 +59,9 @@ public class DefaultSettingsBuilderFactory
*/
public DefaultSettingsBuilder newInstance()
{
- DefaultSettingsBuilder builder = new DefaultSettingsBuilder();
-
- builder.setSettingsReader( newSettingsReader() );
- builder.setSettingsWriter( newSettingsWriter() );
- builder.setSettingsValidator( newSettingsValidator() );
-
- return builder;
+ return new DefaultSettingsBuilder( newSettingsReader(),
+ newSettingsWriter(),
+ newSettingsValidator() );
}
}
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
index 671a20d..7d6c8b9 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
@@ -22,13 +22,15 @@ package org.apache.maven.settings.crypto;
import java.util.ArrayList;
import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.building.DefaultSettingsProblem;
import org.apache.maven.settings.building.SettingsProblem;
import org.apache.maven.settings.building.SettingsProblem.Severity;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
@@ -37,13 +39,18 @@ import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
*
* @author Benjamin Bentmann
*/
-@Component( role = SettingsDecrypter.class )
+@Named
+@Singleton
public class DefaultSettingsDecrypter
implements SettingsDecrypter
{
+ private final SecDispatcher securityDispatcher;
- @Requirement( hint = "maven" )
- private SecDispatcher securityDispatcher;
+ @Inject
+ public DefaultSettingsDecrypter( @Named( "maven" ) SecDispatcher securityDispatcher )
+ {
+ this.securityDispatcher = securityDispatcher;
+ }
@Override
public SettingsDecryptionResult decrypt( SettingsDecryptionRequest request )
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
index fa95613..6044c0c 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
@@ -26,9 +26,11 @@ import java.io.Reader;
import java.util.Map;
import java.util.Objects;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
-import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -37,7 +39,8 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
*
* @author Benjamin Bentmann
*/
-@Component( role = SettingsReader.class )
+@Named
+@Singleton
public class DefaultSettingsReader
implements SettingsReader
{
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
index 96af1a3..10729a2 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
@@ -27,9 +27,11 @@ import java.io.Writer;
import java.util.Map;
import java.util.Objects;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
-import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.WriterFactory;
/**
@@ -37,7 +39,8 @@ import org.codehaus.plexus.util.WriterFactory;
*
* @author Benjamin Bentmann
*/
-@Component( role = SettingsWriter.class )
+@Named
+@Singleton
public class DefaultSettingsWriter
implements SettingsWriter
{
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
index 1e31f50..2aec1e1 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
@@ -23,6 +23,9 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Profile;
import org.apache.maven.settings.Repository;
@@ -31,13 +34,13 @@ import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.building.SettingsProblem.Severity;
import org.apache.maven.settings.building.SettingsProblemCollector;
-import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
/**
* @author Milos Kleint
*/
-@Component( role = SettingsValidator.class )
+@Named
+@Singleton
public class DefaultSettingsValidator
implements SettingsValidator
{