Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Final polish before 1.0.0.RC1

Browse Source
This commit is contained in:
Phillip Webb
2014-01-21 13:30:23 -08:00
parent 853b0a8027
commit ac54d7fe3c
67 changed files with 390 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java
View File

@@ -112,11 +112,14 @@ public class CommandCompleter extends StringsCompleter {
}
this.console.drawLine();
}
catch (IOException e) {
Log.error(e.getMessage() + " (" + e.getClass().getName() + ")");
catch (IOException ex) {
Log.error(ex.getMessage() + " (" + ex.getClass().getName() + ")");
}
}
/**
* Encapsulated options and usage help.
*/
private static class OptionHelpLine {
private final String options;

2
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/EscapeAwareWhiteSpaceArgumentDelimiter.java
View File

@@ -20,7 +20,7 @@ import jline.console.completer.ArgumentCompleter.ArgumentList;
import jline.console.completer.ArgumentCompleter.WhitespaceArgumentDelimiter;
/**
* Escape ware variant of {@link WhitespaceArgumentDelimiter}.
* Escape aware variant of {@link WhitespaceArgumentDelimiter}.
*
* @author Phillip Webb
*/

4
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/RunProcessCommand.java
View File

@@ -103,7 +103,7 @@ class RunProcessCommand extends AbstractCommand {
}
reader.close();
}
catch (Exception e) {
catch (Exception ex) {
}
};
}.start();
@@ -135,7 +135,7 @@ class RunProcessCommand extends AbstractCommand {
this.process = null;
return true;
}
catch (InterruptedException e) {
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
}

3
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java
View File

@@ -64,8 +64,7 @@ import org.springframework.boot.cli.util.ResourceUtils;
*
* <li>Generated class files can also be loaded using
* {@link ClassLoader#getResource(String)}</li>
*
* <ul>
* </ul>
*
* @author Phillip Webb
* @author Dave Syer

3
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -61,7 +61,6 @@ public final class RepositoryConfigurationFactory {
/**
* Add the default local M2 cache directory as a remote repository. Only do this if
* the local cache location has been changed from the default.
*
* @param repositoryConfiguration
*/
public static void addDefaultCacheAsRespository(

8
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/JreProxySelector.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public final class JreProxySelector implements ProxySelector {
URI uri = new URI(repository.getUrl()).parseServerAuthority();
proxies = java.net.ProxySelector.getDefault().select(uri);
}
catch (Exception e) {
catch (Exception ex) {
// URL invalid or not accepted by selector or no selector at all, simply use
// no proxy
}
@@ -113,7 +113,7 @@ public final class JreProxySelector implements ProxySelector {
try {
url = new URL(context.getRepository().getUrl());
}
catch (Exception e) {
catch (Exception ex) {
url = null;
}
@@ -133,7 +133,7 @@ public final class JreProxySelector implements ProxySelector {
System.getProperty("http.proxyPassword"));
}
}
catch (SecurityException e) {
catch (SecurityException ex) {
// oh well, let's hope the proxy can do without auth
}
}

4
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/ManagedDependenciesFactory.java
View File

@@ -28,5 +28,9 @@ import org.eclipse.aether.graph.Dependency;
*/
public interface ManagedDependenciesFactory {
/**
* Returns the managed dependencies.
*/
List<Dependency> getManagedDependencies();
}

3
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/RepositoryConfiguration.java
View File

@@ -34,8 +34,7 @@ public final class RepositoryConfiguration {
private final boolean snapshotsEnabled;
/**
* Creates a new {@code RepositoryConfiguration}.
*
* Creates a new {@code RepositoryConfiguration} instance.
* @param name The name of the repository
* @param uri The uri of the repository
* @param snapshotsEnabled {@code true} if the repository should enable access to

5
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/transformation/GroovyBeansTransformation.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -101,7 +101,6 @@ public class GroovyBeansTransformation implements ASTTransformation {
/**
* Extract a top-level <code>beans{}</code> closure from inside this block if
* there is one. Removes it from the block at the same time.
*
* @param block a block statement (class definition)
* @return a beans Closure if one can be found, null otherwise
*/
@@ -128,9 +127,7 @@ public class GroovyBeansTransformation implements ASTTransformation {
}
}
}
return null;
}
}
}

9
spring-boot-cli/src/main/java/org/springframework/boot/groovy/EnableDeviceResolver.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,9 +22,14 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.boot.cli.compiler.autoconfigure.SpringMobileCompilerAutoConfiguration;
/**
* Pseudo annotation used to trigger {@link SpringMobileCompilerAutoConfiguration}.
*/
@Target(ElementType.TYPE)
@Documented
@Retention(RetentionPolicy.RUNTIME)
public @interface EnableDeviceResolver {
}
}

8
spring-boot-cli/src/main/java/org/springframework/boot/groovy/EnableIntegrationPatterns.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,9 +22,13 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.boot.cli.compiler.autoconfigure.SpringIntegrationCompilerAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
/**
* Pseudo annotation used to trigger {@link SpringIntegrationCompilerAutoConfiguration}.
*/
@Target(ElementType.TYPE)
@Documented
@Retention(RetentionPolicy.RUNTIME)
@@ -32,4 +36,4 @@ import org.springframework.context.annotation.ImportResource;
@ImportResource("classpath:/org/springframework/boot/groovy/integration.xml")
public @interface EnableIntegrationPatterns {
}
}

9
spring-boot-cli/src/main/java/org/springframework/boot/groovy/EnableJmsMessaging.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,9 +22,14 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.boot.cli.compiler.autoconfigure.JmsCompilerAutoConfiguration;
/**
* Pseudo annotation used to trigger {@link JmsCompilerAutoConfiguration}.
*/
@Target(ElementType.TYPE)
@Documented
@Retention(RetentionPolicy.RUNTIME)
public @interface EnableJmsMessaging {
}
}

4
spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,6 +28,8 @@ import java.util.Map;
import org.codehaus.groovy.control.CompilationFailedException;
/**
* Helpful utilties for working with Groovy {@link Template}s.
*
* @author Dave Syer
*/
public abstract class GroovyTemplate {