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

Polish

Browse Source 
See gh-12236
This commit is contained in:
igor-suhorukov
2018-02-27 01:08:28 +03:00
committed by Stephane Nicoll
parent a93052f380
commit 56cbc65e7b
13 changed files with 61 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java
View File

@@ -147,11 +147,9 @@ class Installer {
String home = SystemPropertyUtils
.resolvePlaceholders("${spring.home:${SPRING_HOME:.}}");
File extDirectory = new File(new File(home, "lib"), "ext");
if (!extDirectory.isDirectory()) {
if (!extDirectory.mkdirs()) {
throw new IllegalStateException(
"Failed to create ext directory " + extDirectory);
}
if (!extDirectory.isDirectory() && !extDirectory.mkdirs()) {
throw new IllegalStateException(
"Failed to create ext directory " + extDirectory);
}
return extDirectory;
}

9
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java
View File

@@ -179,11 +179,10 @@ public abstract class AstUtils {
private static ClosureExpression getClosure(String name,
MethodCallExpression expression) {
Expression method = expression.getMethod();
if (method instanceof ConstantExpression) {
if (name.equals(((ConstantExpression) method).getValue())) {
return (ClosureExpression) ((ArgumentListExpression) expression
.getArguments()).getExpression(0);
}
if (method instanceof ConstantExpression
&& name.equals(((ConstantExpression) method).getValue())) {
return (ClosureExpression) ((ArgumentListExpression) expression
.getArguments()).getExpression(0);
}
return null;
}

9
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/ResourceUtils.java
View File

@@ -103,11 +103,10 @@ public abstract class ResourceUtils {
List<String> result = new ArrayList<>();
for (Resource resource : resources) {
if (resource.exists()) {
if (resource.getURI().getScheme().equals("file")) {
if (resource.getFile().isDirectory()) {
result.addAll(getChildFiles(resource));
continue;
}
if (resource.getURI().getScheme().equals("file")
&& resource.getFile().isDirectory()) {
result.addAll(getChildFiles(resource));
continue;
}
result.add(absolutePath(resource));
}