You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2015/01/10 18:01:24 UTC
maven git commit: Add missing @Override annotations
Repository: maven
Updated Branches:
refs/heads/master bb4988496 -> 05686a826
Add missing @Override annotations
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/05686a82
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/05686a82
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/05686a82
Branch: refs/heads/master
Commit: 05686a8260f2e77ea6949d5e6d928f03d44a9eb8
Parents: bb49884
Author: Robert Scholte <rf...@codehaus.org>
Authored: Sat Jan 10 18:00:57 2015 +0100
Committer: Robert Scholte <rf...@codehaus.org>
Committed: Sat Jan 10 18:00:57 2015 +0100
----------------------------------------------------------------------
.../maven/settings/building/DefaultSettingsBuilder.java | 2 ++
.../building/DefaultSettingsBuildingRequest.java | 12 ++++++++++++
.../building/DefaultSettingsBuildingResult.java | 2 ++
.../maven/settings/building/DefaultSettingsProblem.java | 7 +++++++
.../building/DefaultSettingsProblemCollector.java | 1 +
.../maven/settings/crypto/DefaultSettingsDecrypter.java | 1 +
.../crypto/DefaultSettingsDecryptionRequest.java | 4 ++++
.../crypto/DefaultSettingsDecryptionResult.java | 5 +++++
.../apache/maven/settings/io/DefaultSettingsReader.java | 3 +++
.../apache/maven/settings/io/DefaultSettingsWriter.java | 3 +++
.../settings/validation/DefaultSettingsValidator.java | 1 +
11 files changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/05686a82/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
----------------------------------------------------------------------
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 359b2c7..3cdae7d 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
@@ -83,6 +83,7 @@ public class DefaultSettingsBuilder
return this;
}
+ @Override
public SettingsBuildingResult build( SettingsBuildingRequest request )
throws SettingsBuildingException
{
@@ -232,6 +233,7 @@ public class DefaultSettingsBuilder
interpolator.addPostProcessor( new InterpolationPostProcessor()
{
+ @Override
public Object execute( String expression, Object value )
{
if ( value != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/05686a82/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
index 14dc228..5a4824e 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
@@ -43,11 +43,13 @@ public class DefaultSettingsBuildingRequest
private Properties userProperties;
+ @Override
public File getGlobalSettingsFile()
{
return globalSettingsFile;
}
+ @Override
public DefaultSettingsBuildingRequest setGlobalSettingsFile( File globalSettingsFile )
{
this.globalSettingsFile = globalSettingsFile;
@@ -55,11 +57,13 @@ public class DefaultSettingsBuildingRequest
return this;
}
+ @Override
public SettingsSource getGlobalSettingsSource()
{
return globalSettingsSource;
}
+ @Override
public DefaultSettingsBuildingRequest setGlobalSettingsSource( SettingsSource globalSettingsSource )
{
this.globalSettingsSource = globalSettingsSource;
@@ -67,11 +71,13 @@ public class DefaultSettingsBuildingRequest
return this;
}
+ @Override
public File getUserSettingsFile()
{
return userSettingsFile;
}
+ @Override
public DefaultSettingsBuildingRequest setUserSettingsFile( File userSettingsFile )
{
this.userSettingsFile = userSettingsFile;
@@ -79,11 +85,13 @@ public class DefaultSettingsBuildingRequest
return this;
}
+ @Override
public SettingsSource getUserSettingsSource()
{
return userSettingsSource;
}
+ @Override
public DefaultSettingsBuildingRequest setUserSettingsSource( SettingsSource userSettingsSource )
{
this.userSettingsSource = userSettingsSource;
@@ -91,6 +99,7 @@ public class DefaultSettingsBuildingRequest
return this;
}
+ @Override
public Properties getSystemProperties()
{
if ( systemProperties == null )
@@ -101,6 +110,7 @@ public class DefaultSettingsBuildingRequest
return systemProperties;
}
+ @Override
public DefaultSettingsBuildingRequest setSystemProperties( Properties systemProperties )
{
if ( systemProperties != null )
@@ -120,6 +130,7 @@ public class DefaultSettingsBuildingRequest
return this;
}
+ @Override
public Properties getUserProperties()
{
if ( userProperties == null )
@@ -130,6 +141,7 @@ public class DefaultSettingsBuildingRequest
return userProperties;
}
+ @Override
public DefaultSettingsBuildingRequest setUserProperties( Properties userProperties )
{
if ( userProperties != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/05686a82/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
index e6d51c9..5c1392a 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
@@ -43,11 +43,13 @@ class DefaultSettingsBuildingResult
this.problems = ( problems != null ) ? problems : new ArrayList<SettingsProblem>();
}
+ @Override
public Settings getEffectiveSettings()
{
return effectiveSettings;
}
+ @Override
public List<SettingsProblem> getProblems()
{
return problems;
http://git-wip-us.apache.org/repos/asf/maven/blob/05686a82/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
index cf15a03..b261fa1 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java
@@ -64,21 +64,25 @@ public class DefaultSettingsProblem
this.exception = exception;
}
+ @Override
public String getSource()
{
return source;
}
+ @Override
public int getLineNumber()
{
return lineNumber;
}
+ @Override
public int getColumnNumber()
{
return columnNumber;
}
+ @Override
public String getLocation()
{
StringBuilder buffer = new StringBuilder( 256 );
@@ -113,11 +117,13 @@ public class DefaultSettingsProblem
return buffer.toString();
}
+ @Override
public Exception getException()
{
return exception;
}
+ @Override
public String getMessage()
{
String msg;
@@ -139,6 +145,7 @@ public class DefaultSettingsProblem
return msg;
}
+ @Override
public Severity getSeverity()
{
return severity;
http://git-wip-us.apache.org/repos/asf/maven/blob/05686a82/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
index bcab779..6721379 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java
@@ -52,6 +52,7 @@ class DefaultSettingsProblemCollector
this.source = source;
}
+ @Override
public void add( SettingsProblem.Severity severity, String message, int line, int column, Exception cause )
{
if ( line <= 0 && column <= 0 && ( cause instanceof SettingsParseException ) )
http://git-wip-us.apache.org/repos/asf/maven/blob/05686a82/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
----------------------------------------------------------------------
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 c09cf4c..acdb4b2 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
@@ -45,6 +45,7 @@ public class DefaultSettingsDecrypter
@Requirement( hint = "maven" )
private SecDispatcher securityDispatcher;
+ @Override
public SettingsDecryptionResult decrypt( SettingsDecryptionRequest request )
{
List<SettingsProblem> problems = new ArrayList<SettingsProblem>();
http://git-wip-us.apache.org/repos/asf/maven/blob/05686a82/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java
index 884a632..31185f1 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java
@@ -79,6 +79,7 @@ public class DefaultSettingsDecryptionRequest
this.proxies = new ArrayList<Proxy>( Arrays.asList( proxy ) );
}
+ @Override
public List<Server> getServers()
{
if ( servers == null )
@@ -89,6 +90,7 @@ public class DefaultSettingsDecryptionRequest
return servers;
}
+ @Override
public DefaultSettingsDecryptionRequest setServers( List<Server> servers )
{
this.servers = servers;
@@ -96,6 +98,7 @@ public class DefaultSettingsDecryptionRequest
return this;
}
+ @Override
public List<Proxy> getProxies()
{
if ( proxies == null )
@@ -106,6 +109,7 @@ public class DefaultSettingsDecryptionRequest
return proxies;
}
+ @Override
public DefaultSettingsDecryptionRequest setProxies( List<Proxy> proxies )
{
this.proxies = proxies;
http://git-wip-us.apache.org/repos/asf/maven/blob/05686a82/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
index 1e9fd72..33ee5a1 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
@@ -48,26 +48,31 @@ class DefaultSettingsDecryptionResult
this.problems = ( problems != null ) ? problems : new ArrayList<SettingsProblem>();
}
+ @Override
public Server getServer()
{
return servers.isEmpty() ? null : servers.get( 0 );
}
+ @Override
public List<Server> getServers()
{
return servers;
}
+ @Override
public Proxy getProxy()
{
return proxies.isEmpty() ? null : proxies.get( 0 );
}
+ @Override
public List<Proxy> getProxies()
{
return proxies;
}
+ @Override
public List<SettingsProblem> getProblems()
{
return problems;
http://git-wip-us.apache.org/repos/asf/maven/blob/05686a82/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
----------------------------------------------------------------------
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 c538c41..590423e 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
@@ -42,6 +42,7 @@ public class DefaultSettingsReader
implements SettingsReader
{
+ @Override
public Settings read( File input, Map<String, ?> options )
throws IOException
{
@@ -55,6 +56,7 @@ public class DefaultSettingsReader
return settings;
}
+ @Override
public Settings read( Reader input, Map<String, ?> options )
throws IOException
{
@@ -78,6 +80,7 @@ public class DefaultSettingsReader
}
}
+ @Override
public Settings read( InputStream input, Map<String, ?> options )
throws IOException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/05686a82/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
----------------------------------------------------------------------
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 28e09b4..88f78a0 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
@@ -42,6 +42,7 @@ public class DefaultSettingsWriter
implements SettingsWriter
{
+ @Override
public void write( File output, Map<String, Object> options, Settings settings )
throws IOException
{
@@ -60,6 +61,7 @@ public class DefaultSettingsWriter
write( WriterFactory.newXmlWriter( output ), options, settings );
}
+ @Override
public void write( Writer output, Map<String, Object> options, Settings settings )
throws IOException
{
@@ -84,6 +86,7 @@ public class DefaultSettingsWriter
}
}
+ @Override
public void write( OutputStream output, Map<String, Object> options, Settings settings )
throws IOException
{
http://git-wip-us.apache.org/repos/asf/maven/blob/05686a82/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
----------------------------------------------------------------------
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 a26a173..aa4d303 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
@@ -47,6 +47,7 @@ public class DefaultSettingsValidator
private static final String ILLEGAL_REPO_ID_CHARS = ILLEGAL_FS_CHARS;
+ @Override
public void validate( Settings settings, SettingsProblemCollector problems )
{
if ( settings.isUsePluginRegistry() )