root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polish 

See gh-20419
This commit is contained in:
wycm 2020-03-08 16:18:22 +08:00 committed by Stephane Nicoll
parent 278f769f80
commit 916a4743bb
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -99,7 +99,7 @@ class ServiceCapabilitiesReportGenerator {
private void reportAvailableProjectTypes(InitializrServiceMetadata metadata, StringBuilder report) { private void reportAvailableProjectTypes(InitializrServiceMetadata metadata, StringBuilder report) {
report.append("Available project types:").append(NEW_LINE); report.append("Available project types:").append(NEW_LINE);
report.append("------------------------").append(NEW_LINE); report.append("------------------------").append(NEW_LINE);
SortedSet<Entry<String, ProjectType>> entries = new TreeSet<>(Comparator.comparing(Entry::getKey)); SortedSet<Entry<String, ProjectType>> entries = new TreeSet<>(Entry.comparingByKey());
entries.addAll(metadata.getProjectTypes().entrySet()); entries.addAll(metadata.getProjectTypes().entrySet());
for (Entry<String, ProjectType> entry : entries) { for (Entry<String, ProjectType> entry : entries) {
ProjectType type = entry.getValue(); ProjectType type = entry.getValue();

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -95,7 +95,7 @@ class EscapeAwareWhiteSpaceArgumentDelimiter extends WhitespaceArgumentDelimiter
string = string.replace("\\\\", "\\"); string = string.replace("\\\\", "\\");
string = string.replace("\\t", "\t"); string = string.replace("\\t", "\t");
string = string.replace("\\\"", "\""); string = string.replace("\\\"", "\"");
string = string.replace("\\\'", "\'"); string = string.replace("\\'", "'");
return string; return string;
} }

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -221,7 +221,7 @@ public class Shell {
boolean handleSigInt() { boolean handleSigInt() {
Command command = this.lastCommand; Command command = this.lastCommand;
if (command != null && command instanceof RunProcessCommand) { if (command instanceof RunProcessCommand) {
return ((RunProcessCommand) command).handleSigInt(); return ((RunProcessCommand) command).handleSigInt();
} }
return false; return false;

6
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -19,7 +19,7 @@ package org.springframework.boot.devtools.remote.client;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.Proxy.Type; import java.net.Proxy.Type;
import java.net.URL; import java.net.URL;
import java.util.Arrays; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -90,7 +90,7 @@ public class RemoteClientConfiguration implements InitializingBean {
@Bean @Bean
public ClientHttpRequestFactory clientHttpRequestFactory() { public ClientHttpRequestFactory clientHttpRequestFactory() {
List<ClientHttpRequestInterceptor> interceptors = Arrays.asList(getSecurityInterceptor()); List<ClientHttpRequestInterceptor> interceptors = Collections.singletonList(getSecurityInterceptor());
SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory(); SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
Proxy proxy = this.properties.getRemote().getProxy(); Proxy proxy = this.properties.getRemote().getProxy();
if (proxy.getHost() != null && proxy.getPort() != null) { if (proxy.getHost() != null && proxy.getPort() != null) {