Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
d7a12a87
Commit
d7a12a87
authored
Dec 27, 2014
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove superfluous semi-colons
parent
fe20116b
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
40 additions
and
27 deletions
+40
-27
EndpointWebMvcAutoConfiguration.java
...ctuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
+4
-5
MessageSourceAutoConfiguration.java
...rk/boot/autoconfigure/MessageSourceAutoConfiguration.java
+1
-1
ConditionalOnJava.java
...ework/boot/autoconfigure/condition/ConditionalOnJava.java
+3
-1
OnClassCondition.java
...mework/boot/autoconfigure/condition/OnClassCondition.java
+1
-1
SearchStrategy.java
...ramework/boot/autoconfigure/condition/SearchStrategy.java
+1
-1
JerseyProperties.java
...framework/boot/autoconfigure/jersey/JerseyProperties.java
+1
-1
ErrorMvcAutoConfiguration.java
...ork/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java
+1
-1
RepackageTask.java
.../springframework/boot/gradle/repackage/RepackageTask.java
+1
-1
LibraryScope.java
...a/org/springframework/boot/loader/tools/LibraryScope.java
+12
-4
RunProcess.java
...ava/org/springframework/boot/loader/tools/RunProcess.java
+3
-1
AnsiOutput.java
...c/main/java/org/springframework/boot/ansi/AnsiOutput.java
+1
-1
VcapApplicationListener.java
...gframework/boot/cloudfoundry/VcapApplicationListener.java
+1
-1
FileEncodingApplicationListener.java
...amework/boot/context/FileEncodingApplicationListener.java
+1
-1
ConfigFileApplicationListener.java
...rk/boot/context/config/ConfigFileApplicationListener.java
+1
-1
Ssl.java
...n/java/org/springframework/boot/context/embedded/Ssl.java
+1
-1
TomcatEmbeddedServletContainer.java
...ntext/embedded/tomcat/TomcatEmbeddedServletContainer.java
+3
-1
Log4J2LoggingSystem.java
...ingframework/boot/logging/log4j2/Log4J2LoggingSystem.java
+4
-4
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
View file @
d7a12a87
...
...
@@ -229,7 +229,7 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
throw
ex
;
}
}
}
;
}
/**
* Add an alias for 'local.management.port' that actually resolves using
...
...
@@ -298,7 +298,6 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
DISABLE
,
SAME
,
DIFFERENT
;
public
static
ManagementServerPort
get
(
BeanFactory
beanFactory
)
{
ServerProperties
serverProperties
;
try
{
serverProperties
=
beanFactory
.
getBean
(
ServerProperties
.
class
);
...
...
@@ -306,7 +305,6 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
catch
(
NoSuchBeanDefinitionException
ex
)
{
serverProperties
=
new
ServerProperties
();
}
ManagementServerProperties
managementServerProperties
;
try
{
managementServerProperties
=
beanFactory
...
...
@@ -315,7 +313,6 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
catch
(
NoSuchBeanDefinitionException
ex
)
{
managementServerProperties
=
new
ManagementServerProperties
();
}
Integer
port
=
managementServerProperties
.
getPort
();
if
(
port
!=
null
&&
port
<
0
)
{
return
DISABLE
;
...
...
@@ -329,5 +326,7 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
||
(
port
!=
0
&&
port
.
equals
(
serverProperties
.
getPort
()))
?
SAME
:
DIFFERENT
);
}
};
}
}
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java
View file @
d7a12a87
...
...
@@ -197,7 +197,7 @@ public class MessageSourceAutoConfiguration {
if
(
classLoader
!=
ROOT_CLASSLOADER
)
{
super
.
addAllClassLoaderJarRoots
(
classLoader
,
result
);
}
}
;
}
@Override
protected
Set
<
Resource
>
doFindAllClassPathResources
(
String
path
)
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJava.java
View file @
d7a12a87
...
...
@@ -65,7 +65,7 @@ public @interface ConditionalOnJava {
/**
* Older than the specified {@link JavaVersion}.
*/
OLDER_THAN
;
OLDER_THAN
}
...
...
@@ -138,5 +138,7 @@ public @interface ConditionalOnJava {
}
return
SIX
;
}
}
}
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
View file @
d7a12a87
...
...
@@ -126,6 +126,6 @@ class OnClassCondition extends SpringBootCondition {
public
abstract
boolean
matches
(
String
className
,
ConditionContext
context
);
}
;
}
}
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java
View file @
d7a12a87
...
...
@@ -36,6 +36,6 @@ public enum SearchStrategy {
/**
* Search the entire hierarchy
*/
ALL
;
ALL
}
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java
View file @
d7a12a87
...
...
@@ -67,7 +67,7 @@ public class JerseyProperties {
}
public
enum
Type
{
SERVLET
,
FILTER
;
SERVLET
,
FILTER
}
public
static
class
Filter
{
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java
View file @
d7a12a87
...
...
@@ -154,7 +154,7 @@ public class ErrorMvcAutoConfiguration implements EmbeddedServletContainerCustom
}
return
ConditionOutcome
.
match
(
"No error template view detected"
);
}
;
}
}
...
...
spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/RepackageTask.java
View file @
d7a12a87
...
...
@@ -227,7 +227,7 @@ public class RepackageTask extends DefaultTask {
+
"'springBoot.mainClass'"
);
}
}
}
;
}
}
void
setOutputFile
(
File
file
)
{
...
...
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LibraryScope.java
View file @
d7a12a87
...
...
@@ -29,40 +29,48 @@ public interface LibraryScope {
* The library is used at compile time and runtime.
*/
public
static
final
LibraryScope
COMPILE
=
new
LibraryScope
()
{
@Override
public
String
toString
()
{
return
"compile"
;
};
}
};
/**
* The library is used at runtime but not needed for compile.
*/
public
static
final
LibraryScope
RUNTIME
=
new
LibraryScope
()
{
@Override
public
String
toString
()
{
return
"runtime"
;
};
}
};
/**
* The library is needed for compile but is usually provided when running.
*/
public
static
final
LibraryScope
PROVIDED
=
new
LibraryScope
()
{
@Override
public
String
toString
()
{
return
"provided"
;
};
}
};
/**
* Marker for custom scope when custom configuration is used.
*/
public
static
final
LibraryScope
CUSTOM
=
new
LibraryScope
()
{
@Override
public
String
toString
()
{
return
"custom"
;
};
}
};
}
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/RunProcess.java
View file @
d7a12a87
...
...
@@ -128,6 +128,7 @@ public class RunProcess {
final
BufferedReader
reader
=
new
BufferedReader
(
new
InputStreamReader
(
process
.
getInputStream
()));
new
Thread
()
{
@Override
public
void
run
()
{
try
{
...
...
@@ -141,7 +142,8 @@ public class RunProcess {
}
catch
(
Exception
ex
)
{
}
};
}
}.
start
();
}
...
...
spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java
View file @
d7a12a87
...
...
@@ -147,6 +147,6 @@ public abstract class AnsiOutput {
*/
NEVER
}
;
}
}
spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java
View file @
d7a12a87
...
...
@@ -97,7 +97,7 @@ public class VcapApplicationListener implements
private
static
final
String
VCAP_SERVICES
=
"VCAP_SERVICES"
;
// Before ConfigFileApplicationListener so values there can use these ones
private
int
order
=
ConfigFileApplicationListener
.
DEFAULT_ORDER
-
1
;
;
private
int
order
=
ConfigFileApplicationListener
.
DEFAULT_ORDER
-
1
;
private
final
JsonParser
parser
=
JsonParserFactory
.
getJsonParser
();
...
...
spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java
View file @
d7a12a87
...
...
@@ -76,4 +76,4 @@ public class FileEncodingApplicationListener implements
}
}
}
;
}
spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
View file @
d7a12a87
...
...
@@ -128,7 +128,7 @@ public class ConfigFileApplicationListener implements
if
(
event
instanceof
ApplicationPreparedEvent
)
{
onApplicationPreparedEvent
((
ApplicationPreparedEvent
)
event
);
}
}
;
}
private
void
onApplicationEnvironmentPreparedEvent
(
ApplicationEnvironmentPreparedEvent
event
)
{
...
...
spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java
View file @
d7a12a87
...
...
@@ -196,7 +196,7 @@ public class Ssl {
}
public
enum
ClientAuth
{
WANT
,
NEED
;
WANT
,
NEED
}
}
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
View file @
d7a12a87
...
...
@@ -133,10 +133,12 @@ public class TomcatEmbeddedServletContainer implements EmbeddedServletContainer
private
void
startDaemonAwaitThread
()
{
Thread
awaitThread
=
new
Thread
(
"container-"
+
(
containerCounter
.
get
()))
{
@Override
public
void
run
()
{
TomcatEmbeddedServletContainer
.
this
.
tomcat
.
getServer
().
await
();
};
}
};
awaitThread
.
setDaemon
(
false
);
awaitThread
.
start
();
...
...
spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
View file @
d7a12a87
...
...
@@ -67,25 +67,25 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem {
@Override
public
Result
filter
(
LogEvent
event
)
{
return
Result
.
DENY
;
}
;
}
@Override
public
Result
filter
(
Logger
logger
,
Level
level
,
Marker
marker
,
Message
msg
,
Throwable
t
)
{
return
Result
.
DENY
;
}
;
}
@Override
public
Result
filter
(
Logger
logger
,
Level
level
,
Marker
marker
,
Object
msg
,
Throwable
t
)
{
return
Result
.
DENY
;
}
;
}
@Override
public
Result
filter
(
Logger
logger
,
Level
level
,
Marker
marker
,
String
msg
,
Object
...
params
)
{
return
Result
.
DENY
;
}
;
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment