Apply eclipse formatting rules

Apply eclipse formatting rules to b2fe2dd.

See gh-1751

Author: philwebb

spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java

@@ -40,7 +40,8 @@ public class DefaultCommandFactory implements CommandFactory {
 
 	private static final List<Command> DEFAULT_COMMANDS = Arrays.<Command> asList(
 			new VersionCommand(), new RunCommand(), new TestCommand(), new GrabCommand(),
-			new JarCommand(), new InstallCommand(), new UninstallCommand(), new InitCommand());
+			new JarCommand(), new InstallCommand(), new UninstallCommand(),
+			new InitCommand());
 
 	@Override
 	public Collection<Command> getCommands() {

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/Dependency.java

@@ -31,26 +31,27 @@ class Dependency {
 	private String description;
 
 	public String getId() {
-		return id;
+		return this.id;
 	}
 
 	public void setId(String id) {
 		this.id = id;
 	}
 
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	public void setName(String name) {
 		this.name = name;
 	}
 
 	public String getDescription() {
-		return description;
+		return this.description;
 	}
 
 	public void setDescription(String description) {
 		this.description = description;
 	}
+
 }

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.cli.command.init;
 
 import org.apache.http.impl.client.HttpClientBuilder;
-
 import org.springframework.boot.cli.command.Command;
 import org.springframework.boot.cli.command.OptionParsingCommand;
 
@@ -30,7 +29,8 @@
 public class InitCommand extends OptionParsingCommand {
 
 	InitCommand(InitCommandOptionHandler handler) {
-		super("init", "Initialize a new project structure using Spring Initializr", handler);
+		super("init", "Initialize a new project structure from Spring Initializr",
+				handler);
 	}
 
 	public InitCommand() {

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommandOptionHandler.java

@@ -27,8 +27,8 @@
 
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
-import org.apache.http.impl.client.CloseableHttpClient;
 
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.boot.cli.command.options.OptionHandler;
 import org.springframework.boot.cli.command.status.ExitStatus;
 import org.springframework.boot.cli.util.Log;
@@ -78,46 +78,61 @@ public class InitCommandOptionHandler extends OptionHandler {
 
 	@Override
 	protected void options() {
-		this.target = option(Arrays.asList("target"),
-				"URL of the service to use").withRequiredArg().defaultsTo(ProjectGenerationRequest.DEFAULT_SERVICE_URL);
-		this.listMetadata = option(Arrays.asList("list", "l"), "List the capabilities of the service. Use it to " +
-				"discover the dependencies and the types that are available.");
+		this.target = option(Arrays.asList("target"), "URL of the service to use")
+				.withRequiredArg().defaultsTo(
+						ProjectGenerationRequest.DEFAULT_SERVICE_URL);
+		this.listMetadata = option(Arrays.asList("list", "l"),
+				"List the capabilities of the service. Use it to "
+						+ "discover the dependencies and the types that are available.");
 
 		// Project generation settings
 		this.bootVersion = option(Arrays.asList("boot-version", "bv"),
 				"Spring Boot version to use (e.g. 1.2.0.RELEASE)").withRequiredArg();
 		this.dependencies = option(Arrays.asList("dependencies", "d"),
-				"Comma separated list of dependencies to include in the generated project").withRequiredArg();
+				"Comma separated list of dependencies to include in the generated project")
+				.withRequiredArg();
 		this.javaVersion = option(Arrays.asList("java-version", "jv"),
 				"Java version to use (e.g. 1.8)").withRequiredArg();
-		this.packaging = option(Arrays.asList("packaging", "p"), "Packaging type to use (e.g. jar)").withRequiredArg();
-
-		this.build = option("build", "The build system to use (e.g. maven, gradle). To be used alongside " +
-				"--format to uniquely identify one type that is supported by the service. " +
-				"Use --type in case of conflict").withRequiredArg().defaultsTo("maven");
-		this.format = option("format", "The format of the generated content (e.g. build for a build file, " +
-				"project for a project archive). To be used alongside --build to uniquely identify one type " +
-				"that is supported by the service. Use --type in case of conflict")
+		this.packaging = option(Arrays.asList("packaging", "p"),
+				"Packaging type to use (e.g. jar)").withRequiredArg();
+
+		this.build = option(
+				"build",
+				"The build system to use (e.g. maven, gradle). To be used alongside "
+						+ "--format to uniquely identify one type that is supported by the service. "
+						+ "Use --type in case of conflict").withRequiredArg().defaultsTo(
+				"maven");
+		this.format = option(
+				"format",
+				"The format of the generated content (e.g. build for a build file, "
+						+ "project for a project archive). To be used alongside --build to uniquely identify one type "
+						+ "that is supported by the service. Use --type in case of conflict")
 				.withRequiredArg().defaultsTo("project");
-		this.type = option(Arrays.asList("type", "t"), "The project type to use. Not normally needed if you " +
-				"use --build and/or --format. Check the capabilities of the service (--list) for " +
-				"more details.").withRequiredArg();
+		this.type = option(
+				Arrays.asList("type", "t"),
+				"The project type to use. Not normally needed if you "
+						+ "use --build and/or --format. Check the capabilities of the service (--list) for "
+						+ "more details.").withRequiredArg();
 
 		// Others
-		this.extract = option(Arrays.asList("extract", "x"), "Extract the project archive");
-		this.force = option(Arrays.asList("force", "f"), "Force overwrite of existing files");
-		this.output = option(Arrays.asList("output", "o"),
-				"Location of the generated project. Can be an absolute or a relative reference and " +
-						"should refer to a directory when --extract is used.").withRequiredArg();
+		this.extract = option(Arrays.asList("extract", "x"),
+				"Extract the project archive");
+		this.force = option(Arrays.asList("force", "f"),
+				"Force overwrite of existing files");
+		this.output = option(
+				Arrays.asList("output", "o"),
+				"Location of the generated project. Can be an absolute or a relative reference and "
+						+ "should refer to a directory when --extract is used.")
+				.withRequiredArg();
 	}
 
 	@Override
 	protected ExitStatus run(OptionSet options) throws Exception {
-		if (options.has(listMetadata)) {
-			return listServiceCapabilities(options, httpClient);
+		if (options.has(this.listMetadata)) {
+			return listServiceCapabilities(options, this.httpClient);
 		}
 		else {
-			return generateProject(options, httpClient);
+			return generateProject(options, this.httpClient);
 		}
 	}
 
@@ -151,7 +166,8 @@ public ProjectGenerationRequest createProjectGenerationRequest(OptionSet options
 		return request;
 	}
 
-	protected ExitStatus listServiceCapabilities(OptionSet options, CloseableHttpClient httpClient) throws IOException {
+	protected ExitStatus listServiceCapabilities(OptionSet options,
+			CloseableHttpClient httpClient) throws IOException {
 		ListMetadataCommand command = new ListMetadataCommand(httpClient);
 		Log.info(command.generateReport(determineServiceUrl(options)));
 		return ExitStatus.OK;
@@ -161,19 +177,22 @@ protected ExitStatus generateProject(OptionSet options, CloseableHttpClient http
 		ProjectGenerationRequest request = createProjectGenerationRequest(options);
 		boolean forceValue = options.has(this.force);
 		try {
-			ProjectGenerationResponse entity = new InitializrServiceHttpInvoker(httpClient).generate(request);
+			ProjectGenerationResponse entity = new InitializrServiceHttpInvoker(
+					httpClient).generate(request);
 			if (options.has(this.extract)) {
 				if (isZipArchive(entity)) {
-					return extractProject(entity, options.valueOf(this.output), forceValue);
+					return extractProject(entity, options.valueOf(this.output),
+							forceValue);
 				}
 				else {
 					Log.info("Could not extract '" + entity.getContentType() + "'");
 				}
 			}
-			String outputFileName = entity.getFileName() != null ? entity.getFileName() : options.valueOf(this.output);
+			String outputFileName = entity.getFileName() != null ? entity.getFileName()
+					: options.valueOf(this.output);
 			if (outputFileName == null) {
-				Log.error("Could not save the project, the server did not set a preferred " +
-						"file name. Use --output to specify the output location for the project.");
+				Log.error("Could not save the project, the server did not set a preferred "
+						+ "file name. Use --output to specify the output location for the project.");
 				return ExitStatus.ERROR;
 			}
 			return writeProject(entity, outputFileName, forceValue);
@@ -192,8 +211,8 @@ private String determineServiceUrl(OptionSet options) {
 		return options.valueOf(this.target);
 	}
 
-	private ExitStatus writeProject(ProjectGenerationResponse entity, String outputFileName, boolean overwrite)
-			throws IOException {
+	private ExitStatus writeProject(ProjectGenerationResponse entity,
+			String outputFileName, boolean overwrite) throws IOException {
 
 		File f = new File(outputFileName);
 		if (f.exists()) {
@@ -204,8 +223,9 @@ private ExitStatus writeProject(ProjectGenerationResponse entity, String outputF
 				}
 			}
 			else {
-				Log.error("File '" + f.getName() + "' already exists. Use --force if you want to " +
-						"overwrite or --output to specify an alternate location.");
+				Log.error("File '" + f.getName()
+						+ "' already exists. Use --force if you want to "
+						+ "overwrite or --output to specify an alternate location.");
 				return ExitStatus.ERROR;
 			}
 		}
@@ -232,21 +252,26 @@ private boolean isZipArchive(ProjectGenerationResponse entity) {
 		}
 	}
 
-	private ExitStatus extractProject(ProjectGenerationResponse entity, String outputValue, boolean overwrite) throws IOException {
-		File output = outputValue != null ? new File(outputValue) : new File(System.getProperty("user.dir"));
+	private ExitStatus extractProject(ProjectGenerationResponse entity,
+			String outputValue, boolean overwrite) throws IOException {
+		File output = outputValue != null ? new File(outputValue) : new File(
+				System.getProperty("user.dir"));
 		if (!output.exists()) {
 			output.mkdirs();
 		}
-		ZipInputStream zipIn = new ZipInputStream(new ByteArrayInputStream(entity.getContent()));
+		ZipInputStream zipIn = new ZipInputStream(new ByteArrayInputStream(
+				entity.getContent()));
 		try {
 			ZipEntry entry = zipIn.getNextEntry();
 			while (entry != null) {
 				File f = new File(output, entry.getName());
 				if (f.exists() && !overwrite) {
 					StringBuilder sb = new StringBuilder();
 					sb.append(f.isDirectory() ? "Directory" : "File")
-							.append(" '").append(f.getName()).append("' already exists. Use --force if you want to " +
-							"overwrite or --output to specify an alternate location.");
+							.append(" '")
+							.append(f.getName())
+							.append("' already exists. Use --force if you want to "
+									+ "overwrite or --output to specify an alternate location.");
 					Log.error(sb.toString());
 					return ExitStatus.ERROR;
 				}
@@ -268,7 +293,8 @@ private ExitStatus extractProject(ProjectGenerationResponse entity, String outpu
 	}
 
 	private void extractZipEntry(ZipInputStream in, File outputFile) throws IOException {
-		BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(outputFile));
+		BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(
+				outputFile));
 		try {
 			StreamUtils.copy(in, out);
 		}

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceHttpInvoker.java

@@ -31,7 +31,6 @@
 import org.apache.http.message.BasicHeader;
 import org.json.JSONException;
 import org.json.JSONObject;
-
 import org.springframework.boot.cli.util.Log;
 import org.springframework.util.StreamUtils;
 import org.springframework.util.StringUtils;
@@ -57,15 +56,17 @@ class InitializrServiceHttpInvoker {
 	 * Generate a project based on the specified {@link ProjectGenerationRequest}
 	 * @return an entity defining the project
 	 */
-	ProjectGenerationResponse generate(ProjectGenerationRequest request) throws IOException {
+	ProjectGenerationResponse generate(ProjectGenerationRequest request)
+			throws IOException {
 		Log.info("Using service at " + request.getServiceUrl());
 		InitializrServiceMetadata metadata = loadMetadata(request.getServiceUrl());
 		URI url = request.generateUrl(metadata);
 		CloseableHttpResponse httpResponse = executeProjectGenerationRequest(url);
 
 		HttpEntity httpEntity = httpResponse.getEntity();
 		if (httpEntity == null) {
-			throw new ProjectGenerationException("No content received from server using '" + url + "'");
+			throw new ProjectGenerationException(
+					"No content received from server using '" + url + "'");
 		}
 		if (httpResponse.getStatusLine().getStatusCode() != 200) {
 			throw buildProjectGenerationException(request.getServiceUrl(), httpResponse);
@@ -79,23 +80,26 @@ ProjectGenerationResponse generate(ProjectGenerationRequest request) throws IOEx
 	InitializrServiceMetadata loadMetadata(String serviceUrl) throws IOException {
 		CloseableHttpResponse httpResponse = executeInitializrMetadataRetrieval(serviceUrl);
 		if (httpResponse.getEntity() == null) {
-			throw new ProjectGenerationException("No content received from server using '" + serviceUrl + "'");
+			throw new ProjectGenerationException(
+					"No content received from server using '" + serviceUrl + "'");
 		}
 		if (httpResponse.getStatusLine().getStatusCode() != 200) {
 			throw buildProjectGenerationException(serviceUrl, httpResponse);
 		}
 		try {
 			HttpEntity httpEntity = httpResponse.getEntity();
-			JSONObject root = getContentAsJson(getContent(httpEntity), getContentType(httpEntity));
+			JSONObject root = getContentAsJson(getContent(httpEntity),
+					getContentType(httpEntity));
 			return new InitializrServiceMetadata(root);
 		}
 		catch (JSONException e) {
-			throw new ProjectGenerationException("Invalid content received from server (" + e.getMessage() + ")");
+			throw new ProjectGenerationException("Invalid content received from server ("
+					+ e.getMessage() + ")");
 		}
 	}
 
-	private ProjectGenerationResponse createResponse(CloseableHttpResponse httpResponse, HttpEntity httpEntity)
-			throws IOException {
+	private ProjectGenerationResponse createResponse(CloseableHttpResponse httpResponse,
+			HttpEntity httpEntity) throws IOException {
 		ProjectGenerationResponse response = new ProjectGenerationResponse();
 		ContentType contentType = ContentType.getOrDefault(httpEntity);
 		response.setContentType(contentType);
@@ -108,7 +112,8 @@ private ProjectGenerationResponse createResponse(CloseableHttpResponse httpRespo
 			in.close();
 		}
 
-		String detectedFileName = extractFileName(httpResponse.getFirstHeader("Content-Disposition"));
+		String detectedFileName = extractFileName(httpResponse
+				.getFirstHeader("Content-Disposition"));
 		if (detectedFileName != null) {
 			response.setFileName(detectedFileName);
 		}
@@ -124,8 +129,8 @@ private CloseableHttpResponse executeProjectGenerationRequest(URI url) {
 			return this.httpClient.execute(get);
 		}
 		catch (IOException e) {
-			throw new ProjectGenerationException(
-					"Failed to invoke server at '" + url + "' (" + e.getMessage() + ")");
+			throw new ProjectGenerationException("Failed to invoke server at '" + url
+					+ "' (" + e.getMessage() + ")");
 		}
 	}
 
@@ -140,11 +145,11 @@ private CloseableHttpResponse executeInitializrMetadataRetrieval(String serviceU
 		}
 		catch (IOException e) {
 			throw new ProjectGenerationException(
-					"Failed to retrieve metadata from service at '" + serviceUrl + "' (" + e.getMessage() + ")");
+					"Failed to retrieve metadata from service at '" + serviceUrl + "' ("
+							+ e.getMessage() + ")");
 		}
 	}
 
-
 	private byte[] getContent(HttpEntity httpEntity) throws IOException {
 		InputStream in = httpEntity.getContent();
 		try {
@@ -160,12 +165,14 @@ private ContentType getContentType(HttpEntity httpEntity) {
 	}
 
 	private JSONObject getContentAsJson(byte[] content, ContentType contentType) {
-		Charset charset = contentType.getCharset() != null ? contentType.getCharset() : Charset.forName("UTF-8");
+		Charset charset = contentType.getCharset() != null ? contentType.getCharset()
+				: Charset.forName("UTF-8");
 		String data = new String(content, charset);
 		return new JSONObject(data);
 	}
 
-	private ProjectGenerationException buildProjectGenerationException(String url, CloseableHttpResponse httpResponse) {
+	private ProjectGenerationException buildProjectGenerationException(String url,
+			CloseableHttpResponse httpResponse) {
 		StringBuilder sb = new StringBuilder("Project generation failed using '");
 		sb.append(url).append("' - service returned ")
 				.append(httpResponse.getStatusLine().getReasonPhrase());
@@ -174,7 +181,9 @@ private ProjectGenerationException buildProjectGenerationException(String url, C
 			sb.append(": '").append(error).append("'");
 		}
 		else {
-			sb.append(" (unexpected ").append(httpResponse.getStatusLine().getStatusCode()).append(" error)");
+			sb.append(" (unexpected ")
+					.append(httpResponse.getStatusLine().getStatusCode())
+					.append(" error)");
 		}
 		throw new ProjectGenerationException(sb.toString());
 	}
@@ -184,7 +193,8 @@ private String extractMessage(HttpEntity entity) {
 			return null;
 		}
 		try {
-			JSONObject error = getContentAsJson(getContent(entity), getContentType(entity));
+			JSONObject error = getContentAsJson(getContent(entity),
+					getContentType(entity));
 			if (error.has("message")) {
 				return error.getString("message");
 			}