This commit is contained in:
Stephane Nicoll
2015-07-24 07:19:53 +02:00
parent d6e914be87
commit 42e230192f
50 changed files with 100 additions and 104 deletions

View File

@@ -41,12 +41,12 @@ public @interface ConditionalOnClass {
* classpath.
* @return the classes that must be present
*/
public Class<?>[] value() default {};
Class<?>[] value() default {};
/**
* The classes names that must be present.
* @return the class names that must be present.
*/
public String[] name() default {};
String[] name() default {};
}

View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.condition;
import java.lang.annotation.Documented;
@@ -57,7 +58,7 @@ public @interface ConditionalOnJava {
/**
* Range options.
*/
public enum Range {
enum Range {
/**
* Equal to, or newer than the specified {@link JavaVersion}.
@@ -74,7 +75,7 @@ public @interface ConditionalOnJava {
/**
* Java versions.
*/
public enum JavaVersion {
enum JavaVersion {
/**
* Java 1.6.

View File

@@ -40,7 +40,7 @@ public @interface ConditionalOnMissingClass {
* The names of the classes that must not be present.
* @return the names of the classes that must not be present
*/
public String[] value() default {};
String[] value() default {};
/**
* An alias for {@link #value} specifying the names of the classes that must not be
@@ -48,6 +48,6 @@ public @interface ConditionalOnMissingClass {
* @return the class names that must not be present.
* @deprecated since 1.3.0 in favor of {@link #value}.
*/
public String[] name() default {};
String[] name() default {};
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2015 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.
@@ -40,6 +40,6 @@ public @interface ConditionalOnResource {
* The resources that must be present.
* @return the resource paths that must be present.
*/
public String[] resources() default {};
String[] resources() default {};
}

View File

@@ -194,7 +194,7 @@ public class EntityManagerFactoryBuilder {
/**
* A callback for new entity manager factory beans created by a Builder.
*/
public static interface EntityManagerFactoryBeanCallback {
public interface EntityManagerFactoryBeanCallback {
void execute(LocalContainerEntityManagerFactoryBean factory);

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -38,7 +38,7 @@ public interface ErrorAttributes {
* @param includeStackTrace if stack trace elements should be included
* @return a map of error attributes
*/
public Map<String, Object> getErrorAttributes(RequestAttributes requestAttributes,
Map<String, Object> getErrorAttributes(RequestAttributes requestAttributes,
boolean includeStackTrace);
/**
@@ -47,6 +47,6 @@ public interface ErrorAttributes {
* @param requestAttributes the source request attributes
* @return the {@link Exception} that caused the error or {@code null}
*/
public Throwable getError(RequestAttributes requestAttributes);
Throwable getError(RequestAttributes requestAttributes);
}

View File

@@ -30,6 +30,6 @@ public interface ErrorController {
* Returns the path of the error page.
* @return the error path
*/
public String getErrorPath();
String getErrorPath();
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -116,7 +116,7 @@ public class AopAutoConfigurationTests {
public interface TestInterface {
public abstract void foo();
void foo();
}

View File

@@ -76,7 +76,7 @@ public class DataSourceJsonSerializationTests {
}
@JsonSerialize(using = TomcatDataSourceSerializer.class)
protected static interface DataSourceJson {
protected interface DataSourceJson {
}
protected static class TomcatDataSourceSerializer extends JsonSerializer<DataSource> {

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -100,7 +100,7 @@ public class JerseyAutoConfigurationCustomFilterContextPathTests {
@Import({ EmbeddedServletContainerAutoConfiguration.class,
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -99,7 +99,7 @@ public class JerseyAutoConfigurationCustomFilterPathTests {
@Import({ EmbeddedServletContainerAutoConfiguration.class,
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -99,7 +99,7 @@ public class JerseyAutoConfigurationCustomServletContextPathTests {
@Import({ EmbeddedServletContainerAutoConfiguration.class,
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -99,7 +99,7 @@ public class JerseyAutoConfigurationCustomServletPathTests {
@Import({ EmbeddedServletContainerAutoConfiguration.class,
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -97,7 +97,7 @@ public class JerseyAutoConfigurationDefaultFilterPathTests {
@Import({ EmbeddedServletContainerAutoConfiguration.class,
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -97,7 +97,7 @@ public class JerseyAutoConfigurationDefaultServletPathTests {
@Import({ EmbeddedServletContainerAutoConfiguration.class,
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -90,7 +90,7 @@ public class MustacheAutoConfigurationIntegrationTests {
ServerPropertiesAutoConfiguration.class,
DispatcherServletAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
@Configuration

View File

@@ -108,7 +108,7 @@ public class MustacheWebIntegrationTests {
ServerPropertiesAutoConfiguration.class,
DispatcherServletAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
@Configuration

View File

@@ -215,7 +215,7 @@ public class SpringBootWebSecurityConfigurationTests {
DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class,
ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -20,6 +20,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
public interface UserRepository extends JpaRepository<User, Integer> {
public User findByEmail(String email);
User findByEmail(String email);
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -113,7 +113,7 @@ public class BasicErrorControllerDirectMockMvcTests {
DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class,
ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
@Configuration

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2015 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.
@@ -134,7 +134,7 @@ public class BasicErrorControllerMockMvcTests {
DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class,
ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
@Configuration

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2015 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.
@@ -98,7 +98,7 @@ public class DefaultErrorViewIntegrationTests {
DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class,
ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
@Configuration

View File

@@ -90,7 +90,7 @@ public class WelcomePageMockMvcTests {
DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class,
ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration {
protected @interface MinimalWebConfiguration {
}
@Configuration