Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed errors reported by Checkstyle 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@813612 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Herve Boutemy 2009-09-10 21:58:39 +00:00
parent 388fcd100e
commit b82977a18c
13 changed files with 230 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
View File

@ -1,18 +1,22 @@
package org.apache.maven.execution;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
* agreements. See the NOTICE file distributed with this work for additional information regarding
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.io.File;
@ -129,7 +133,9 @@ public class DefaultMavenExecutionRequest
*/
private boolean noSnapshotUpdates;
public DefaultMavenExecutionRequest() { }
public DefaultMavenExecutionRequest()
{
}
public static MavenExecutionRequest copy( MavenExecutionRequest original )
{

6
maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
View File

@ -61,9 +61,9 @@ private static void decomposeParameterIntoUserInstructions( MojoDescriptor mojo,
if ( param.isEditable() )
{
messageBuffer.append( "Inside the definition for plugin \'" + mojo.getPluginDescriptor().getArtifactId() +
"\' specify the following:\n\n<configuration>\n ...\n <" + param.getName() + ">VALUE</" +
param.getName() + ">\n</configuration>" );
messageBuffer.append( "Inside the definition for plugin \'" + mojo.getPluginDescriptor().getArtifactId()
+ "\' specify the following:\n\n<configuration>\n ...\n <" + param.getName() + ">VALUE</"
+ param.getName() + ">\n</configuration>" );
String alias = param.getAlias();
if ( StringUtils.isNotEmpty( alias ) && !alias.equals( param.getName() ) )

4
maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
View File

@ -42,8 +42,8 @@ public InvalidProjectVersionException( String projectId, String locationInPom, S
private static String formatMessage( String projectId, String locationInPom, String offendingVersion,
InvalidVersionSpecificationException cause )
{
return "Invalid version: " + offendingVersion + " found for: " + locationInPom + " in project: " + projectId +
". Reason: " + cause.getMessage();
return "Invalid version: " + offendingVersion + " found for: " + locationInPom + " in project: " + projectId
+ ". Reason: " + cause.getMessage();
}
public String getOffendingVersion()

4
maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java
View File

@ -43,8 +43,8 @@ public SettingsConfigurationException( String message, Throwable cause )
public SettingsConfigurationException( String message, Throwable cause, int lineNumber, int columnNumber )
{
super( message + ( lineNumber > 0 ? "\n Line: " + lineNumber : "" ) +
( columnNumber > 0 ? "\n Column: " + columnNumber : "" ), cause );
super( message + ( lineNumber > 0 ? "\n Line: " + lineNumber : "" )
+ ( columnNumber > 0 ? "\n Column: " + columnNumber : "" ), cause );
this.lineNumber = lineNumber;
this.columnNumber = columnNumber;
}

10
maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
View File

@ -19,7 +19,6 @@
* under the License.
*/
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
@ -33,7 +32,6 @@
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
@ -74,9 +72,11 @@ public void setUp()
}
@Override
protected void tearDown() throws Exception {
factory = null;
super.tearDown();
protected void tearDown()
throws Exception
{
factory = null;
super.tearDown();
}
public void testPluginDescriptorExpressionReference()

8
maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
View File

@ -35,9 +35,11 @@ protected void setUp()
}
@Override
protected void tearDown() throws Exception {
repositorySystem = null;
super.tearDown();
protected void tearDown()
throws Exception
{
repositorySystem = null;
super.tearDown();
}
public void testShouldNotCarryExclusionsOverFromDependencyToDependency()

18
maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
View File

@ -67,16 +67,18 @@ public void testDependencyManagementOverridesTransitiveDependencyVersion()
assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
Set set = project1.getArtifacts();
assertNotNull("No artifacts", set);
assertTrue("No Artifacts", set.size() > 0);
assertTrue("Set size should be 3, is " + set.size(), set.size() == 3);
assertNotNull( "No artifacts", set );
assertTrue( "No Artifacts", set.size() > 0 );
assertTrue( "Set size should be 3, is " + set.size(), set.size() == 3 );
Iterator iter = set.iterator();
while (iter.hasNext()) {
Artifact artifact = (Artifact)iter.next();
System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() +
" Optional=" + (artifact.isOptional() ? "true" : "false"));
assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0"));
while ( iter.hasNext() )
{
Artifact artifact = (Artifact) iter.next();
System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion()
+ " Optional=" + ( artifact.isOptional() ? "true" : "false" ) );
assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
artifact.getVersion().equals( "1.0" ) );
}
}

14
maven-core/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
View File

@ -63,16 +63,16 @@ public void testDependencyManagement()
assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
Set set = project1.getArtifacts();
assertNotNull("No artifacts", set);
assertTrue("No Artifacts", set.size() > 0);
assertNotNull( "No artifacts", set );
assertTrue( "No Artifacts", set.size() > 0 );
Iterator iter = set.iterator();
while (iter.hasNext())
while ( iter.hasNext() )
{
Artifact artifact = (Artifact)iter.next();
System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " +
artifact.getVersion() + " Scope: " + artifact.getScope());
assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0"));
Artifact artifact = (Artifact) iter.next();
System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " "
+ artifact.getVersion() + " Scope: " + artifact.getScope() );
assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals( "1.0" ) );
}
}

17
maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
View File

@ -63,17 +63,18 @@ public void testDependencyManagement()
assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
Set set = project1.getArtifacts();
assertNotNull("No artifacts", set);
assertTrue("No Artifacts", set.size() > 0);
assertNotNull( "No artifacts", set );
assertTrue( "No Artifacts", set.size() > 0 );
Iterator iter = set.iterator();
assertTrue("Set size should be 4, is " + set.size(), set.size() == 4);
assertTrue( "Set size should be 4, is " + set.size(), set.size() == 4 );
while (iter.hasNext())
while ( iter.hasNext() )
{
Artifact artifact = (Artifact)iter.next();
System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() +
" Optional=" + (artifact.isOptional() ? "true" : "false"));
assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0"));
Artifact artifact = (Artifact) iter.next();
System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion()
+ " Optional=" + ( artifact.isOptional() ? "true" : "false" ) );
assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
artifact.getVersion().equals( "1.0" ) );
}
}

19
maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
View File

@ -62,19 +62,20 @@ public void testDependencyManagement()
MavenProject project1 = getProjectWithDependencies( pom1 );
assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
System.out.println("Project " + project1.getId() + " " + project1);
System.out.println( "Project " + project1.getId() + " " + project1 );
Set set = project1.getArtifacts();
assertNotNull("No artifacts", set);
assertTrue("No Artifacts", set.size() > 0);
assertNotNull( "No artifacts", set );
assertTrue( "No Artifacts", set.size() > 0 );
Iterator iter = set.iterator();
assertTrue("Set size should be 4, is " + set.size(), set.size() == 4);
assertTrue( "Set size should be 4, is " + set.size(), set.size() == 4 );
while (iter.hasNext())
while ( iter.hasNext() )
{
Artifact artifact = (Artifact)iter.next();
System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() +
" Optional=" + (artifact.isOptional() ? "true" : "false"));
assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0"));
Artifact artifact = (Artifact) iter.next();
System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion()
+ " Optional=" + ( artifact.isOptional() ? "true" : "false" ) );
assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
artifact.getVersion().equals( "1.0" ) );
}
}

82
maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
View File

@ -1,10 +1,28 @@
package org.apache.maven.settings;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.model.Profile;
import org.apache.maven.project.DefaultProjectBuilder;
@ -20,11 +38,11 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class PomConstructionWithSettingsTest
extends PlexusTestCase
extends PlexusTestCase
{
private static String BASE_DIR = "src/test";
private static final String BASE_DIR = "src/test";
private static String BASE_POM_DIR = BASE_DIR + "/resources-settings";
private static final String BASE_POM_DIR = BASE_DIR + "/resources-settings";
private DefaultProjectBuilder projectBuilder;
@ -41,60 +59,64 @@ protected void setUp()
}
@Override
protected void tearDown() throws Exception {
projectBuilder = null;
protected void tearDown()
throws Exception
{
projectBuilder = null;
super.tearDown();
super.tearDown();
}
public void testSettingsNoPom() throws Exception
{
PomTestWrapper pom = buildPom( "settings-no-pom" );
assertEquals( "local-profile-prop-value", pom.getValue( "properties/local-profile-prop" ) );
PomTestWrapper pom = buildPom( "settings-no-pom" );
assertEquals( "local-profile-prop-value", pom.getValue( "properties/local-profile-prop" ) );
}
/**MNG-4107 */
public void testPomAndSettingsInterpolation() throws Exception
{
PomTestWrapper pom = buildPom( "test-pom-and-settings-interpolation" );
assertEquals("applied", pom.getValue( "properties/settingsProfile" ) );
assertEquals("applied", pom.getValue( "properties/pomProfile" ) );
assertEquals("settings", pom.getValue( "properties/pomVsSettings" ) );
assertEquals("settings", pom.getValue( "properties/pomVsSettingsInterpolated" ) );
PomTestWrapper pom = buildPom( "test-pom-and-settings-interpolation" );
assertEquals( "applied", pom.getValue( "properties/settingsProfile" ) );
assertEquals( "applied", pom.getValue( "properties/pomProfile" ) );
assertEquals( "settings", pom.getValue( "properties/pomVsSettings" ) );
assertEquals( "settings", pom.getValue( "properties/pomVsSettingsInterpolated" ) );
}
/**MNG-4107 */
public void testRepositories() throws Exception
{
PomTestWrapper pom = buildPom( "repositories" );
assertEquals("maven-core-it-0", pom.getValue( "repositories[1]/id" ));
PomTestWrapper pom = buildPom( "repositories" );
assertEquals( "maven-core-it-0", pom.getValue( "repositories[1]/id" ) );
}
private PomTestWrapper buildPom( String pomPath )
throws Exception
{
File pomFile = new File( testDirectory + File.separator + pomPath , "pom.xml" );
File settingsFile = new File( testDirectory + File.separator + pomPath, "settings.xml" );
Settings settings = readSettingsFile(settingsFile);
{
File pomFile = new File( testDirectory + File.separator + pomPath, "pom.xml" );
File settingsFile = new File( testDirectory + File.separator + pomPath, "settings.xml" );
Settings settings = readSettingsFile( settingsFile );
ProjectBuildingRequest config = new DefaultProjectBuildingRequest();
for ( org.apache.maven.settings.Profile rawProfile : settings.getProfiles() )
{
Profile profile = SettingsUtils.convertFromSettingsProfile( rawProfile );
config.addProfile( profile );
}
for ( org.apache.maven.settings.Profile rawProfile : settings.getProfiles() )
{
Profile profile = SettingsUtils.convertFromSettingsProfile( rawProfile );
config.addProfile( profile );
}
String localRepoUrl = System.getProperty( "maven.repo.local", System.getProperty( "user.home" ) + "/.m2/repository" );
String localRepoUrl =
System.getProperty( "maven.repo.local", System.getProperty( "user.home" ) + "/.m2/repository" );
localRepoUrl = "file://" + localRepoUrl;
config.setLocalRepository( repositorySystem.createArtifactRepository( "local", localRepoUrl, new DefaultRepositoryLayout(), null, null ) );
config.setLocalRepository( repositorySystem.createArtifactRepository( "local", localRepoUrl,
new DefaultRepositoryLayout(), null, null ) );
config.setActiveProfileIds( settings.getActiveProfiles() );
return new PomTestWrapper( pomFile, projectBuilder.build( pomFile, config ).getProject() );
}
}
private static Settings readSettingsFile(File settingsFile)
throws IOException, XmlPullParserException
private static Settings readSettingsFile( File settingsFile )
throws IOException, XmlPullParserException
{
Settings settings = null;

46
maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
View File

@ -29,41 +29,49 @@
*
* @author mkleint
*/
public class DefaultSettingsValidatorTest extends TestCase {
public class DefaultSettingsValidatorTest
extends TestCase
{
public DefaultSettingsValidatorTest(String testName) {
super(testName);
public DefaultSettingsValidatorTest( String testName )
{
super( testName );
}
protected void setUp() throws Exception {
protected void setUp()
throws Exception
{
super.setUp();
}
protected void tearDown() throws Exception {
protected void tearDown()
throws Exception
{
super.tearDown();
}
public void testValidate() {
public void testValidate()
{
Settings model = new Settings();
Profile prof = new Profile();
prof.setId("xxx");
model.addProfile(prof);
prof.setId( "xxx" );
model.addProfile( prof );
DefaultSettingsValidator instance = new DefaultSettingsValidator();
SettingsValidationResult result = instance.validate(model);
assertEquals(0, result.getMessageCount());
SettingsValidationResult result = instance.validate( model );
assertEquals( 0, result.getMessageCount() );
Repository repo = new Repository();
prof.addRepository(repo);
result = instance.validate(model);
assertEquals(2, result.getMessageCount());
prof.addRepository( repo );
result = instance.validate( model );
assertEquals( 2, result.getMessageCount() );
repo.setUrl("http://xxx.xxx.com");
result = instance.validate(model);
assertEquals(1, result.getMessageCount());
repo.setUrl( "http://xxx.xxx.com" );
result = instance.validate( model );
assertEquals( 1, result.getMessageCount() );
repo.setId("xxx");
result = instance.validate(model);
assertEquals(0, result.getMessageCount());
repo.setId( "xxx" );
result = instance.validate( model );
assertEquals( 0, result.getMessageCount() );
}

41
maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
View File

@ -25,37 +25,42 @@
*
* @author mkleint
*/
public class RequirementMatcherFactoryTest extends TestCase {
public class RequirementMatcherFactoryTest
extends TestCase
{
public RequirementMatcherFactoryTest(String testName) {
super(testName);
public RequirementMatcherFactoryTest( String testName )
{
super( testName );
}
/**
* Test of createExactMatcher method, of class RequirementMatcherFactory.
*/
public void testCreateExactMatcher() {
public void testCreateExactMatcher()
{
RequirementMatcher matcher;
matcher = RequirementMatcherFactory.createExactMatcher("foo");
assertFalse(matcher.matches("bar"));
assertFalse(matcher.matches("foobar"));
assertFalse(matcher.matches("foob"));
assertTrue(matcher.matches("foo"));
matcher = RequirementMatcherFactory.createExactMatcher( "foo" );
assertFalse( matcher.matches( "bar" ) );
assertFalse( matcher.matches( "foobar" ) );
assertFalse( matcher.matches( "foob" ) );
assertTrue( matcher.matches( "foo" ) );
}
/**
* Test of createVersionMatcher method, of class RequirementMatcherFactory.
*/
public void testCreateVersionMatcher() {
public void testCreateVersionMatcher()
{
RequirementMatcher matcher;
matcher = RequirementMatcherFactory.createVersionMatcher("1.5.2");
assertFalse(matcher.matches("1.5"));
assertTrue(matcher.matches("1.5.2"));
assertFalse(matcher.matches("[1.4,1.5)"));
assertFalse(matcher.matches("[1.5,1.5.2)"));
assertFalse(matcher.matches("(1.5.2,1.6)"));
assertTrue(matcher.matches("(1.4,1.5.2]"));
assertTrue(matcher.matches("(1.5,)"));
matcher = RequirementMatcherFactory.createVersionMatcher( "1.5.2" );
assertFalse( matcher.matches( "1.5" ) );
assertTrue( matcher.matches( "1.5.2" ) );
assertFalse( matcher.matches( "[1.4,1.5)" ) );
assertFalse( matcher.matches( "[1.5,1.5.2)" ) );
assertFalse( matcher.matches( "(1.5.2,1.6)" ) );
assertTrue( matcher.matches( "(1.4,1.5.2]" ) );
assertTrue( matcher.matches( "(1.5,)" ) );
}
}