Reformat code using Eclipse Mars

spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java

@@ -78,9 +78,9 @@ public class GrabCommandIntegrationTests {
 	@Test
 	public void customMetadata() throws Exception {
 		System.setProperty("grape.root", "target");
-		FileSystemUtils.copyRecursively(new File(
-				"src/test/resources/grab-samples/repository"), new File(
-				"target/repository"));
+		FileSystemUtils.copyRecursively(
+				new File("src/test/resources/grab-samples/repository"),
+				new File("target/repository"));
 		this.cli.grab("customDependencyManagement.groovy", "--autoconfigure=false");
 		assertTrue(new File("target/repository/javax/ejb/ejb-api/3.0").isDirectory());
 	}

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java

@@ -136,8 +136,9 @@ public class ProjectGenerationRequestTests {
 		this.request.setVersion("1.0.1-SNAPSHOT");
 		this.request.setDescription("Spring Boot Test");
 		assertEquals(
-				createDefaultUrl("?groupId=org.acme&artifactId=sample&version=1.0.1-SNAPSHOT"
-						+ "&description=Spring+Boot+Test&type=test-type"),
+				createDefaultUrl(
+						"?groupId=org.acme&artifactId=sample&version=1.0.1-SNAPSHOT"
+								+ "&description=Spring+Boot+Test&type=test-type"),
 				this.request.generateUrl(createDefaultMetadata()));
 	}
 

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/DependencyCustomizerTests.java

@@ -56,13 +56,13 @@ public class DependencyCustomizerTests {
 	@Before
 	public void setUp() {
 		MockitoAnnotations.initMocks(this);
-		given(this.resolver.getGroupId("spring-boot-starter-logging")).willReturn(
-				"org.springframework.boot");
-		given(this.resolver.getArtifactId("spring-boot-starter-logging")).willReturn(
-				"spring-boot-starter-logging");
+		given(this.resolver.getGroupId("spring-boot-starter-logging"))
+				.willReturn("org.springframework.boot");
+		given(this.resolver.getArtifactId("spring-boot-starter-logging"))
+				.willReturn("spring-boot-starter-logging");
 		this.moduleNode.addClass(this.classNode);
-		this.dependencyCustomizer = new DependencyCustomizer(new GroovyClassLoader(
-				getClass().getClassLoader()), this.moduleNode,
+		this.dependencyCustomizer = new DependencyCustomizer(
+				new GroovyClassLoader(getClass().getClassLoader()), this.moduleNode,
 				new DependencyResolutionContext() {
 
 					@Override
@@ -104,48 +104,52 @@ public class DependencyCustomizerTests {
 		assertEquals(1, grabAnnotations.size());
 		AnnotationNode annotationNode = grabAnnotations.get(0);
 		assertGrabAnnotation(annotationNode, "org.springframework.boot",
-				"spring-boot-starter-logging", "1.2.3", "my-classifier", "my-type", false);
+				"spring-boot-starter-logging", "1.2.3", "my-classifier", "my-type",
+				false);
 	}
 
 	@Test
 	public void anyMissingClassesWithMissingClassesPerformsAdd() {
-		this.dependencyCustomizer.ifAnyMissingClasses("does.not.Exist").add(
-				"spring-boot-starter-logging");
+		this.dependencyCustomizer.ifAnyMissingClasses("does.not.Exist")
+				.add("spring-boot-starter-logging");
 		assertEquals(1, this.classNode.getAnnotations(new ClassNode(Grab.class)).size());
 	}
 
 	@Test
 	public void anyMissingClassesWithMixtureOfClassesPerformsAdd() {
-		this.dependencyCustomizer.ifAnyMissingClasses(getClass().getName(),
-				"does.not.Exist").add("spring-boot-starter-logging");
+		this.dependencyCustomizer
+				.ifAnyMissingClasses(getClass().getName(), "does.not.Exist")
+				.add("spring-boot-starter-logging");
 		assertEquals(1, this.classNode.getAnnotations(new ClassNode(Grab.class)).size());
 	}
 
 	@Test
 	public void anyMissingClassesWithNoMissingClassesDoesNotPerformAdd() {
-		this.dependencyCustomizer.ifAnyMissingClasses(getClass().getName()).add(
-				"spring-boot-starter-logging");
+		this.dependencyCustomizer.ifAnyMissingClasses(getClass().getName())
+				.add("spring-boot-starter-logging");
 		assertEquals(0, this.classNode.getAnnotations(new ClassNode(Grab.class)).size());
 	}
 
 	@Test
 	public void allMissingClassesWithNoMissingClassesDoesNotPerformAdd() {
-		this.dependencyCustomizer.ifAllMissingClasses(getClass().getName()).add(
-				"spring-boot-starter-logging");
+		this.dependencyCustomizer.ifAllMissingClasses(getClass().getName())
+				.add("spring-boot-starter-logging");
 		assertEquals(0, this.classNode.getAnnotations(new ClassNode(Grab.class)).size());
 	}
 
 	@Test
 	public void allMissingClassesWithMixtureOfClassesDoesNotPerformAdd() {
-		this.dependencyCustomizer.ifAllMissingClasses(getClass().getName(),
-				"does.not.Exist").add("spring-boot-starter-logging");
+		this.dependencyCustomizer
+				.ifAllMissingClasses(getClass().getName(), "does.not.Exist")
+				.add("spring-boot-starter-logging");
 		assertEquals(0, this.classNode.getAnnotations(new ClassNode(Grab.class)).size());
 	}
 
 	@Test
 	public void allMissingClassesWithAllClassesMissingPerformsAdd() {
-		this.dependencyCustomizer.ifAllMissingClasses("does.not.Exist",
-				"does.not.exist.Either").add("spring-boot-starter-logging");
+		this.dependencyCustomizer
+				.ifAllMissingClasses("does.not.Exist", "does.not.exist.Either")
+				.add("spring-boot-starter-logging");
 		assertEquals(1, this.classNode.getAnnotations(new ClassNode(Grab.class)).size());
 	}
 

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java

@@ -42,24 +42,23 @@ public class RepositoryConfigurationFactoryTests {
 			public void run() {
 				List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
 						.createDefaultRepositoryConfiguration();
-				assertRepositoryConfiguration(repositoryConfiguration, "central",
-						"local", "spring-snapshot", "spring-milestone");
+				assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
+						"spring-snapshot", "spring-milestone");
 			}
 		}, "user.home:src/test/resources/maven-settings/basic");
 	}
 
 	@Test
 	public void snapshotRepositoriesDisabled() {
-		SystemProperties.doWithSystemProperties(
-				new Runnable() {
-					@Override
-					public void run() {
-						List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
-								.createDefaultRepositoryConfiguration();
-						assertRepositoryConfiguration(repositoryConfiguration, "central",
-								"local");
-					}
-				}, "user.home:src/test/resources/maven-settings/basic",
+		SystemProperties.doWithSystemProperties(new Runnable() {
+			@Override
+			public void run() {
+				List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
+						.createDefaultRepositoryConfiguration();
+				assertRepositoryConfiguration(repositoryConfiguration, "central",
+						"local");
+			}
+		}, "user.home:src/test/resources/maven-settings/basic",
 				"disableSpringSnapshotRepos:true");
 	}
 
@@ -70,27 +69,23 @@ public class RepositoryConfigurationFactoryTests {
 			public void run() {
 				List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
 						.createDefaultRepositoryConfiguration();
-				assertRepositoryConfiguration(repositoryConfiguration, "central",
-						"local", "spring-snapshot", "spring-milestone",
-						"active-by-default");
+				assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
+						"spring-snapshot", "spring-milestone", "active-by-default");
 			}
 		}, "user.home:src/test/resources/maven-settings/active-profile-repositories");
 	}
 
 	@Test
 	public void activeByPropertyProfileRepositories() {
-		SystemProperties.doWithSystemProperties(
-				new Runnable() {
-					@Override
-					public void run() {
-						List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
-								.createDefaultRepositoryConfiguration();
-						assertRepositoryConfiguration(repositoryConfiguration, "central",
-								"local", "spring-snapshot", "spring-milestone",
-								"active-by-property");
-					}
-				},
-				"user.home:src/test/resources/maven-settings/active-profile-repositories",
+		SystemProperties.doWithSystemProperties(new Runnable() {
+			@Override
+			public void run() {
+				List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
+						.createDefaultRepositoryConfiguration();
+				assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
+						"spring-snapshot", "spring-milestone", "active-by-property");
+			}
+		}, "user.home:src/test/resources/maven-settings/active-profile-repositories",
 				"foo:bar");
 	}
 

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java

@@ -63,7 +63,8 @@ public final class ResolveDependencyCoordinatesTransformationTests {
 
 	private final AnnotationNode grabAnnotation = createGrabAnnotation();
 
-	private final ArtifactCoordinatesResolver coordinatesResolver = mock(ArtifactCoordinatesResolver.class);
+	private final ArtifactCoordinatesResolver coordinatesResolver = mock(
+			ArtifactCoordinatesResolver.class);
 
 	private final DependencyResolutionContext resolutionContext = new DependencyResolutionContext() {
 
@@ -79,8 +80,8 @@ public final class ResolveDependencyCoordinatesTransformationTests {
 
 	@Before
 	public void setupExpectations() {
-		given(this.coordinatesResolver.getGroupId("spring-core")).willReturn(
-				"org.springframework");
+		given(this.coordinatesResolver.getGroupId("spring-core"))
+				.willReturn("org.springframework");
 	}
 
 	@Test
@@ -233,8 +234,8 @@ public final class ResolveDependencyCoordinatesTransformationTests {
 			return null;
 		}
 		else {
-			throw new IllegalStateException("Member '" + memberName
-					+ "' is not a ConstantExpression");
+			throw new IllegalStateException(
+					"Member '" + memberName + "' is not a ConstantExpression");
 		}
 	}
 

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/dependencies/CompositeDependencyManagementTests.java

@@ -47,8 +47,10 @@ public class CompositeDependencyManagementTests {
 	public void unknownSpringBootVersion() {
 		given(this.dependencyManagement1.getSpringBootVersion()).willReturn(null);
 		given(this.dependencyManagement2.getSpringBootVersion()).willReturn(null);
-		assertThat(new CompositeDependencyManagement(this.dependencyManagement1,
-				this.dependencyManagement2).getSpringBootVersion(), is(nullValue()));
+		assertThat(
+				new CompositeDependencyManagement(this.dependencyManagement1,
+						this.dependencyManagement2).getSpringBootVersion(),
+				is(nullValue()));
 	}
 
 	@Test
@@ -69,26 +71,27 @@ public class CompositeDependencyManagementTests {
 
 	@Test
 	public void knownDependency() {
-		given(this.dependencyManagement1.find("artifact")).willReturn(
-				new Dependency("test", "artifact", "1.2.3"));
-		given(this.dependencyManagement2.find("artifact")).willReturn(
-				new Dependency("test", "artifact", "1.2.4"));
-		assertThat(new CompositeDependencyManagement(this.dependencyManagement1,
-				this.dependencyManagement2).find("artifact"), is(new Dependency("test",
-				"artifact", "1.2.3")));
+		given(this.dependencyManagement1.find("artifact"))
+				.willReturn(new Dependency("test", "artifact", "1.2.3"));
+		given(this.dependencyManagement2.find("artifact"))
+				.willReturn(new Dependency("test", "artifact", "1.2.4"));
+		assertThat(
+				new CompositeDependencyManagement(this.dependencyManagement1,
+						this.dependencyManagement2).find("artifact"),
+				is(new Dependency("test", "artifact", "1.2.3")));
 	}
 
 	@Test
 	public void getDependencies() {
-		given(this.dependencyManagement1.getDependencies()).willReturn(
-				Arrays.asList(new Dependency("test", "artifact", "1.2.3")));
-		given(this.dependencyManagement2.getDependencies()).willReturn(
-				Arrays.asList(new Dependency("test", "artifact", "1.2.4")));
+		given(this.dependencyManagement1.getDependencies())
+				.willReturn(Arrays.asList(new Dependency("test", "artifact", "1.2.3")));
+		given(this.dependencyManagement2.getDependencies())
+				.willReturn(Arrays.asList(new Dependency("test", "artifact", "1.2.4")));
 		assertThat(
 				new CompositeDependencyManagement(this.dependencyManagement1,
 						this.dependencyManagement2).getDependencies(),
-				contains(new Dependency("test", "artifact", "1.2.3"), new Dependency(
-						"test", "artifact", "1.2.4")));
+				contains(new Dependency("test", "artifact", "1.2.3"),
+						new Dependency("test", "artifact", "1.2.4")));
 	}
 
 }

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/dependencies/DependencyManagementArtifactCoordinatesResolverTests.java

@@ -43,8 +43,8 @@ public class DependencyManagementArtifactCoordinatesResolverTests {
 	@Before
 	public void setup() {
 		this.dependencyManagement = mock(DependencyManagement.class);
-		given(this.dependencyManagement.find("a1")).willReturn(
-				new Dependency("g1", "a1", "0"));
+		given(this.dependencyManagement.find("a1"))
+				.willReturn(new Dependency("g1", "a1", "0"));
 		given(this.dependencyManagement.getSpringBootVersion()).willReturn("1");
 		this.resolver = new DependencyManagementArtifactCoordinatesResolver(
 				this.dependencyManagement);

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java

@@ -53,8 +53,8 @@ public class AetherGrapeEngineTests {
 	private AetherGrapeEngine createGrapeEngine(
 			RepositoryConfiguration... additionalRepositories) {
 		List<RepositoryConfiguration> repositoryConfigurations = new ArrayList<RepositoryConfiguration>();
-		repositoryConfigurations.add(new RepositoryConfiguration("central", URI
-				.create("http://repo1.maven.org/maven2"), false));
+		repositoryConfigurations.add(new RepositoryConfiguration("central",
+				URI.create("http://repo1.maven.org/maven2"), false));
 		repositoryConfigurations.addAll(Arrays.asList(additionalRepositories));
 		return AetherGrapeEngineFactory.create(this.groovyClassLoader,
 				repositoryConfigurations, new DependencyResolutionContext());
@@ -138,10 +138,8 @@ public class AetherGrapeEngineTests {
 	public void nonTransitiveDependencyResolution() {
 		Map<String, Object> args = new HashMap<String, Object>();
 
-		createGrapeEngine().grab(
-				args,
-				createDependency("org.springframework", "spring-jdbc", "3.2.4.RELEASE",
-						false));
+		createGrapeEngine().grab(args, createDependency("org.springframework",
+				"spring-jdbc", "3.2.4.RELEASE", false));
 
 		assertEquals(1, this.groovyClassLoader.getURLs().length);
 	}

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java

@@ -75,30 +75,27 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests {
 	public void propertyInterpolation() throws SettingsBuildingException {
 		final DefaultRepositorySystemSession session = MavenRepositorySystemUtils
 				.newSession();
-		given(
-				this.repositorySystem.newLocalRepositoryManager(eq(session),
-						any(LocalRepository.class))).willAnswer(
-				new Answer<LocalRepositoryManager>() {
+		given(this.repositorySystem.newLocalRepositoryManager(eq(session),
+				any(LocalRepository.class)))
+						.willAnswer(new Answer<LocalRepositoryManager>() {
 
-					@Override
-					public LocalRepositoryManager answer(InvocationOnMock invocation)
-							throws Throwable {
-						LocalRepository localRepository = invocation.getArgumentAt(1,
-								LocalRepository.class);
-						return new SimpleLocalRepositoryManagerFactory().newInstance(
-								session, localRepository);
-					}
-				});
+							@Override
+							public LocalRepositoryManager answer(
+									InvocationOnMock invocation) throws Throwable {
+								LocalRepository localRepository = invocation
+										.getArgumentAt(1, LocalRepository.class);
+								return new SimpleLocalRepositoryManagerFactory()
+										.newInstance(session, localRepository);
+							}
+						});
 
-		SystemProperties.doWithSystemProperties(
-				new Runnable() {
-					@Override
-					public void run() {
-						new SettingsXmlRepositorySystemSessionAutoConfiguration()
-								.apply(session,
-										SettingsXmlRepositorySystemSessionAutoConfigurationTests.this.repositorySystem);
-					}
-				}, "user.home:src/test/resources/maven-settings/property-interpolation",
+		SystemProperties.doWithSystemProperties(new Runnable() {
+			@Override
+			public void run() {
+				new SettingsXmlRepositorySystemSessionAutoConfiguration().apply(session,
+						SettingsXmlRepositorySystemSessionAutoConfigurationTests.this.repositorySystem);
+			}
+		}, "user.home:src/test/resources/maven-settings/property-interpolation",
 				"foo:bar");
 
 		assertThat(session.getLocalRepository().getBasedir().getAbsolutePath(),
@@ -112,14 +109,13 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests {
 		SystemProperties.doWithSystemProperties(new Runnable() {
 			@Override
 			public void run() {
-				new SettingsXmlRepositorySystemSessionAutoConfiguration()
-						.apply(session,
-								SettingsXmlRepositorySystemSessionAutoConfigurationTests.this.repositorySystem);
+				new SettingsXmlRepositorySystemSessionAutoConfiguration().apply(session,
+						SettingsXmlRepositorySystemSessionAutoConfigurationTests.this.repositorySystem);
 			}
 		}, "user.home:" + userHome);
 
-		RemoteRepository repository = new RemoteRepository.Builder("my-server",
-				"default", "http://maven.example.com").build();
+		RemoteRepository repository = new RemoteRepository.Builder("my-server", "default",
+				"http://maven.example.com").build();
 
 		assertMirrorSelectorConfiguration(session, repository);
 		assertProxySelectorConfiguration(session, repository);
@@ -130,8 +126,8 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests {
 			RemoteRepository repository) {
 		Proxy proxy = session.getProxySelector().getProxy(repository);
 		repository = new RemoteRepository.Builder(repository).setProxy(proxy).build();
-		AuthenticationContext authenticationContext = AuthenticationContext.forProxy(
-				session, repository);
+		AuthenticationContext authenticationContext = AuthenticationContext
+				.forProxy(session, repository);
 		assertEquals("proxy.example.com", proxy.getHost());
 		assertEquals("proxyuser",
 				authenticationContext.get(AuthenticationContext.USERNAME));
@@ -139,10 +135,11 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests {
 				authenticationContext.get(AuthenticationContext.PASSWORD));
 	}
 
-	private void assertMirrorSelectorConfiguration(
-			DefaultRepositorySystemSession session, RemoteRepository repository) {
+	private void assertMirrorSelectorConfiguration(DefaultRepositorySystemSession session,
+			RemoteRepository repository) {
 		RemoteRepository mirror = session.getMirrorSelector().getMirror(repository);
-		assertNotNull("No mirror configured for repository " + repository.getId(), mirror);
+		assertNotNull("No mirror configured for repository " + repository.getId(),
+				mirror);
 		assertEquals("maven.example.com", mirror.getHost());
 	}
 
@@ -151,8 +148,8 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests {
 		Authentication authentication = session.getAuthenticationSelector()
 				.getAuthentication(repository);
 
-		repository = new RemoteRepository.Builder(repository).setAuthentication(
-				authentication).build();
+		repository = new RemoteRepository.Builder(repository)
+				.setAuthentication(authentication).build();
 
 		AuthenticationContext authenticationContext = AuthenticationContext
 				.forRepository(session, repository);