Reformat code

This commit is contained in:
Phillip Webb 2015-09-08 14:56:40 -07:00
parent 2615990ffb
commit 67402405db
56 changed files with 188 additions and 252 deletions

View File

@ -226,7 +226,7 @@ public class EndpointWebMvcChildContextConfiguration {
// the same place)
this.server.customize(container);
// Then reset the error pages
container.setErrorPages(Collections.<ErrorPage> emptySet());
container.setErrorPages(Collections.<ErrorPage>emptySet());
// and add the management-specific bits
container.setPort(this.managementServerProperties.getPort());
container.setAddress(this.managementServerProperties.getAddress());

View File

@ -241,7 +241,7 @@ public class ManagementWebSecurityAutoConfiguration {
}
if (this.endpointHandlerMapping == null) {
this.endpointHandlerMapping = new EndpointHandlerMapping(
Collections.<MvcEndpoint> emptySet());
Collections.<MvcEndpoint>emptySet());
}
}
}

View File

@ -67,7 +67,8 @@ public abstract class AbstractJmxCacheStatisticsProvider<C extends Cache> implem
* {@code null} if none is found.
* @param cache the cache to handle
* @return the object name of the cache statistics MBean
* @throws MalformedObjectNameException if the {@link ObjectName} for that cache is invalid
* @throws MalformedObjectNameException if the {@link ObjectName} for that cache is
* invalid
*/
protected abstract ObjectName getObjectName(C cache)
throws MalformedObjectNameException;

View File

@ -39,8 +39,8 @@ import org.springframework.web.client.RestTemplate;
* HTTP endpoint provided by the server. Data are buffered according to the
* {@link #setBufferSize(int) bufferSize} property, and only flushed automatically when
* the buffer size is reached. Users should either manually {@link #flush()} after writing
* a batch of data if that makes sense, or consider adding a {@link Scheduled
* Scheduled} task to flush periodically.
* a batch of data if that makes sense, or consider adding a {@link Scheduled Scheduled}
* task to flush periodically.
*
* @author Dave Syer
* @since 1.3.0

View File

@ -72,7 +72,7 @@ public class MetricExportersTests {
public void exporter() {
this.export.setUpDefaults();
this.exporters = new MetricExporters(this.export);
this.exporters.setExporters(Collections.<String, Exporter> singletonMap("foo",
this.exporters.setExporters(Collections.<String, Exporter>singletonMap("foo",
new MetricCopyExporter(this.reader, this.writer)));
this.exporters.configureTasks(new ScheduledTaskRegistrar());
assertNotNull(this.exporters.getExporters());

View File

@ -42,7 +42,7 @@ public class DataSourcePoolMetadataProviders implements DataSourcePoolMetadataPr
public DataSourcePoolMetadataProviders(
Collection<? extends DataSourcePoolMetadataProvider> providers) {
this.providers = (providers == null ? Collections
.<DataSourcePoolMetadataProvider> emptyList()
.<DataSourcePoolMetadataProvider>emptyList()
: new ArrayList<DataSourcePoolMetadataProvider>(providers));
}

View File

@ -200,8 +200,8 @@ public class MongoProperties {
/**
* Creates a {@link MongoClient} using the given {@code options} and
* {@code environment}. If the configured port is zero, the value of the
* {@code local.mongo.port} property retrieved from the {@code environment} is used
* to configure the client.
* {@code local.mongo.port} property retrieved from the {@code environment} is used to
* configure the client.
*
* @param options the options
* @param environment the environment

View File

@ -206,8 +206,7 @@ public class EmbeddedMongoAutoConfiguration {
private ToStringFriendlyFeatureAwareVersion(String version, Set<Feature> features) {
Assert.notNull(version, "version must not be null");
this.version = version;
this.features = features == null ? Collections.<Feature> emptySet()
: features;
this.features = features == null ? Collections.<Feature>emptySet() : features;
}
@Override

View File

@ -113,7 +113,7 @@ public class OAuth2AuthorizationServerConfiguration extends
"password", "client_credentials", "implicit", "refresh_token"));
details.setAuthorities(AuthorityUtils
.commaSeparatedStringToAuthorityList("ROLE_USER"));
details.setRegisteredRedirectUri(Collections.<String> emptySet());
details.setRegisteredRedirectUri(Collections.<String>emptySet());
return details;
}

View File

@ -114,7 +114,7 @@ public class ResourceServerTokenServicesConfiguration {
}
OAuth2RestTemplate template = getTemplate();
template.setInterceptors(Arrays
.<ClientHttpRequestInterceptor> asList(new AcceptJsonRequestInterceptor()));
.<ClientHttpRequestInterceptor>asList(new AcceptJsonRequestInterceptor()));
AuthorizationCodeAccessTokenProvider accessTokenProvider = new AuthorizationCodeAccessTokenProvider();
accessTokenProvider.setTokenRequestEnhancer(new AcceptJsonRequestEnhancer());
template.setAccessTokenProvider(accessTokenProvider);

View File

@ -125,7 +125,7 @@ public class UserInfoTokenServices implements ResourceServerTokenServices {
catch (Exception ex) {
this.logger.info("Could not fetch user details: " + ex.getClass() + ", "
+ ex.getMessage());
return Collections.<String, Object> singletonMap("error",
return Collections.<String, Object>singletonMap("error",
"Could not fetch user details");
}
}

View File

@ -49,8 +49,7 @@ public class WebMvcProperties {
private String dateFormat;
/**
* If the content of the "default" model should be ignored during redirect
* scenarios.
* If the content of the "default" model should be ignored during redirect scenarios.
*/
private boolean ignoreDefaultModelOnRedirect = true;

View File

@ -35,8 +35,8 @@ import static org.junit.Assert.assertEquals;
*
* @author Dave Syer
*/
@SpringApplicationConfiguration({ Config.class,
MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
@SpringApplicationConfiguration({ Config.class, MessageSourceAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
@RunWith(SpringJUnit4ClassRunner.class)
@IntegrationTest("spring.messages.basename:test/messages")
public class MessageSourceAutoConfigurationIntegrationTests {

View File

@ -35,8 +35,8 @@ import static org.junit.Assert.assertEquals;
*
* @author Dave Syer
*/
@SpringApplicationConfiguration({ Config.class,
MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
@SpringApplicationConfiguration({ Config.class, MessageSourceAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
@RunWith(SpringJUnit4ClassRunner.class)
@ActiveProfiles("switch-messages")
public class MessageSourceAutoConfigurationProfileTests {

View File

@ -615,8 +615,8 @@ public class CacheAutoConfigurationTests {
@Bean
public javax.cache.CacheManager customJCacheCacheManager() {
javax.cache.CacheManager cacheManager = mock(javax.cache.CacheManager.class);
when(cacheManager.getCacheNames()).thenReturn(
Collections.<String> emptyList());
when(cacheManager.getCacheNames())
.thenReturn(Collections.<String>emptyList());
return cacheManager;
}

View File

@ -81,7 +81,7 @@ public class UserInfoTokenServicesTests {
this.services.setRestTemplate(this.template);
given(this.template.getForEntity(any(String.class), any(Class.class))).willThrow(
new UserRedirectRequiredException("foo:bar", Collections
.<String, String> emptyMap()));
.<String, String>emptyMap()));
this.expected.expect(InvalidTokenException.class);
assertEquals("unknown", this.services.loadAuthentication("FOO").getName());
}

View File

@ -138,8 +138,8 @@ public abstract class AstUtils {
}
/**
* Extract a top-level {@code name} closure from inside this block if there is
* one, optionally removing it from the block at the same time.
* Extract a top-level {@code name} closure from inside this block if there is one,
* optionally removing it from the block at the same time.
* @param block a block statement (class definition)
* @param name the name to look for
* @param remove whether or not the extracted closure should be removed

View File

@ -105,7 +105,8 @@ public class GroovyCompiler {
}
this.transformations = new ArrayList<ASTTransformation>();
this.transformations.add(new DependencyManagementBomTransformation(resolutionContext));
this.transformations.add(new DependencyManagementBomTransformation(
resolutionContext));
this.transformations.add(new DependencyAutoConfigurationTransformation(
this.loader, resolutionContext, this.compilerAutoConfigurations));
this.transformations.add(new GroovyBeansTransformation());

View File

@ -31,7 +31,8 @@ public class SpringSecurityCompilerAutoConfiguration extends CompilerAutoConfigu
@Override
public boolean matches(ClassNode classNode) {
return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableWebSecurity", "EnableGlobalMethodSecurity");
return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableWebSecurity",
"EnableGlobalMethodSecurity");
}
@Override
@ -44,7 +45,8 @@ public class SpringSecurityCompilerAutoConfiguration extends CompilerAutoConfigu
@Override
public void applyImports(ImportCustomizer imports) {
imports.addImports("org.springframework.security.core.Authentication",
imports.addImports(
"org.springframework.security.core.Authentication",
"org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity",
"org.springframework.security.core.authority.AuthorityUtils")
.addStarImports(

View File

@ -24,7 +24,7 @@ import org.springframework.http.ResponseEntity;
import static org.junit.Assert.assertEquals;
/**
* Integration Tests for {@link SampleTomcatDeployApplication}.
* Integration Tests for {@link SampleTomcatDeployApplication}.
*/
public class SampleTomcatDeployApplicationIT {

View File

@ -24,7 +24,7 @@ import org.springframework.http.ResponseEntity;
import static org.junit.Assert.assertEquals;
/**
* Integration Tests for {@link SampleTomEEDeployApplication}.
* Integration Tests for {@link SampleTomEEDeployApplication}.
*/
public class SampleTomEEDeployApplicationIT {

View File

@ -83,8 +83,8 @@ class ConnectionInputStream extends FilterInputStream {
}
/**
* Read a number of bytes from the stream (checking that the end of the stream
* hasn't been reached)
* Read a number of bytes from the stream (checking that the end of the stream hasn't
* been reached)
* @param buffer the destination buffer
* @param offset the buffer offset
* @param length the length to read

View File

@ -33,16 +33,16 @@ public class HttpStatusHandler implements Handler {
private final HttpStatus status;
/**
* Create a new {@link HttpStatusHandler} instance that will respond with a HTTP OK 200
* status.
* Create a new {@link HttpStatusHandler} instance that will respond with a HTTP OK
* 200 status.
*/
public HttpStatusHandler() {
this(HttpStatus.OK);
}
/**
* Create a new {@link HttpStatusHandler} instance that will respond with the specified
* status.
* Create a new {@link HttpStatusHandler} instance that will respond with the
* specified status.
* @param status the status
*/
public HttpStatusHandler(HttpStatus status) {

View File

@ -33,8 +33,8 @@ import java.util.regex.Pattern;
class ChangeableUrls implements Iterable<URL> {
private static final String[] SKIPPED_PROJECTS = { "spring-boot",
"spring-boot-devtools", "spring-boot-autoconfigure",
"spring-boot-actuator", "spring-boot-starter" };
"spring-boot-devtools", "spring-boot-autoconfigure", "spring-boot-actuator",
"spring-boot-starter" };
private static final Pattern STARTER_PATTERN = Pattern
.compile("\\/spring-boot-starter-[\\w-]+\\/");

View File

@ -119,7 +119,7 @@ public class LocalDevToolsAutoConfigurationTests {
LiveReloadServer server = this.context.getBean(LiveReloadServer.class);
reset(server);
ClassPathChangedEvent event = new ClassPathChangedEvent(this.context,
Collections.<ChangedFiles> emptySet(), false);
Collections.<ChangedFiles>emptySet(), false);
this.context.publishEvent(event);
verify(server).triggerReload();
}
@ -130,7 +130,7 @@ public class LocalDevToolsAutoConfigurationTests {
LiveReloadServer server = this.context.getBean(LiveReloadServer.class);
reset(server);
ClassPathChangedEvent event = new ClassPathChangedEvent(this.context,
Collections.<ChangedFiles> emptySet(), true);
Collections.<ChangedFiles>emptySet(), true);
this.context.publishEvent(event);
verify(server, never()).triggerReload();
}
@ -148,7 +148,7 @@ public class LocalDevToolsAutoConfigurationTests {
public void restartTriggeredOnClassPathChangeWithRestart() throws Exception {
this.context = initializeAndRun(Config.class);
ClassPathChangedEvent event = new ClassPathChangedEvent(this.context,
Collections.<ChangedFiles> emptySet(), true);
Collections.<ChangedFiles>emptySet(), true);
this.context.publishEvent(event);
verify(this.mockRestarter.getMock()).restart(any(FailureHandler.class));
}
@ -157,7 +157,7 @@ public class LocalDevToolsAutoConfigurationTests {
public void restartNotTriggeredOnClassPathChangeWithRestart() throws Exception {
this.context = initializeAndRun(Config.class);
ClassPathChangedEvent event = new ClassPathChangedEvent(this.context,
Collections.<ChangedFiles> emptySet(), false);
Collections.<ChangedFiles>emptySet(), false);
this.context.publishEvent(event);
verify(this.mockRestarter.getMock(), never()).restart();
}
@ -211,7 +211,7 @@ public class LocalDevToolsAutoConfigurationTests {
}
private ConfigurableApplicationContext initializeAndRun(Class<?> config) {
return initializeAndRun(config, Collections.<String, Object> emptyMap());
return initializeAndRun(config, Collections.<String, Object>emptyMap());
}
private ConfigurableApplicationContext initializeAndRun(Class<?> config,

View File

@ -79,7 +79,7 @@ public class DispatcherTests {
public void accessManagerMustNotBeNull() throws Exception {
this.thrown.expect(IllegalArgumentException.class);
this.thrown.expectMessage("AccessManager must not be null");
new Dispatcher(null, Collections.<HandlerMapper> emptyList());
new Dispatcher(null, Collections.<HandlerMapper>emptyList());
}
@Test

View File

@ -48,10 +48,12 @@ public class SampleAntApplicationIT {
});
assertThat("Number of jars", jarFiles.length, equalTo(1));
Process process = new JavaExecutable().processBuilder("-jar", jarFiles[0].getName()).directory(target).start();
Process process = new JavaExecutable()
.processBuilder("-jar", jarFiles[0].getName()).directory(target).start();
process.waitFor(5, TimeUnit.MINUTES);
assertThat(process.exitValue(), equalTo(0));
String output = FileCopyUtils.copyToString(new InputStreamReader(process.getInputStream()));
String output = FileCopyUtils.copyToString(new InputStreamReader(process
.getInputStream()));
assertThat(output, containsString("Spring Boot Ant Example"));
}

View File

@ -50,8 +50,8 @@ public interface GemstoneService {
/**
* Return a listing of Gemstones currently stored in the GemFire Cache.
* @return an Iterable object to iterate over the list of Gemstones currently stored in
* the GemFire Cache.
* @return an Iterable object to iterate over the list of Gemstones currently stored
* in the GemFire Cache.
* @see java.lang.Iterable
* @see sample.data.gemfire.domain.Gemstone
*/

View File

@ -97,8 +97,8 @@ public class GemstoneServiceImpl implements GemstoneService {
* Return a listing of Gemstones currently stored in the GemFire Cache.
* <p/>
*
* @return an Iterable object to iterate over the list of Gemstones currently stored in
* the GemFire Cache.
* @return an Iterable object to iterate over the list of Gemstones currently stored
* in the GemFire Cache.
* @see java.lang.Iterable
* @see sample.data.gemfire.domain.Gemstone
*/

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain;
import javax.annotation.Generated;
import org.jooq.ForeignKey;
@ -21,18 +20,11 @@ import sample.jooq.domain.tables.records.BookStoreRecord;
import sample.jooq.domain.tables.records.BookToBookStoreRecord;
import sample.jooq.domain.tables.records.LanguageRecord;
/**
* A class modelling foreign key relationships between tables of the <code>PUBLIC</code>
* A class modelling foreign key relationships between tables of the <code>PUBLIC</code>
* schema
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Keys {
@ -40,7 +32,6 @@ public class Keys {
// IDENTITY definitions
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
// UNIQUE and PRIMARY KEY definitions
// -------------------------------------------------------------------------
@ -65,17 +56,30 @@ public class Keys {
// -------------------------------------------------------------------------
private static class UniqueKeys0 extends AbstractKeys {
public static final UniqueKey<LanguageRecord> CONSTRAINT_C = createUniqueKey(Language.LANGUAGE, Language.LANGUAGE.ID);
public static final UniqueKey<AuthorRecord> CONSTRAINT_7 = createUniqueKey(Author.AUTHOR, Author.AUTHOR.ID);
public static final UniqueKey<BookRecord> CONSTRAINT_1 = createUniqueKey(Book.BOOK, Book.BOOK.ID);
public static final UniqueKey<BookStoreRecord> CONSTRAINT_F = createUniqueKey(BookStore.BOOK_STORE, BookStore.BOOK_STORE.NAME);
public static final UniqueKey<BookToBookStoreRecord> CONSTRAINT_2 = createUniqueKey(BookToBookStore.BOOK_TO_BOOK_STORE, BookToBookStore.BOOK_TO_BOOK_STORE.NAME, BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID);
public static final UniqueKey<LanguageRecord> CONSTRAINT_C = createUniqueKey(
Language.LANGUAGE, Language.LANGUAGE.ID);
public static final UniqueKey<AuthorRecord> CONSTRAINT_7 = createUniqueKey(
Author.AUTHOR, Author.AUTHOR.ID);
public static final UniqueKey<BookRecord> CONSTRAINT_1 = createUniqueKey(
Book.BOOK, Book.BOOK.ID);
public static final UniqueKey<BookStoreRecord> CONSTRAINT_F = createUniqueKey(
BookStore.BOOK_STORE, BookStore.BOOK_STORE.NAME);
public static final UniqueKey<BookToBookStoreRecord> CONSTRAINT_2 = createUniqueKey(
BookToBookStore.BOOK_TO_BOOK_STORE,
BookToBookStore.BOOK_TO_BOOK_STORE.NAME,
BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID);
}
private static class ForeignKeys0 extends AbstractKeys {
public static final ForeignKey<BookRecord, AuthorRecord> FK_BOOK_AUTHOR = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_7, Book.BOOK, Book.BOOK.AUTHOR_ID);
public static final ForeignKey<BookRecord, LanguageRecord> FK_BOOK_LANGUAGE = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_C, Book.BOOK, Book.BOOK.LANGUAGE_ID);
public static final ForeignKey<BookToBookStoreRecord, BookStoreRecord> FK_B2BS_BOOK_STORE = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_F, BookToBookStore.BOOK_TO_BOOK_STORE, BookToBookStore.BOOK_TO_BOOK_STORE.NAME);
public static final ForeignKey<BookToBookStoreRecord, BookRecord> FK_B2BS_BOOK = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_1, BookToBookStore.BOOK_TO_BOOK_STORE, BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID);
public static final ForeignKey<BookRecord, AuthorRecord> FK_BOOK_AUTHOR = createForeignKey(
sample.jooq.domain.Keys.CONSTRAINT_7, Book.BOOK, Book.BOOK.AUTHOR_ID);
public static final ForeignKey<BookRecord, LanguageRecord> FK_BOOK_LANGUAGE = createForeignKey(
sample.jooq.domain.Keys.CONSTRAINT_C, Book.BOOK, Book.BOOK.LANGUAGE_ID);
public static final ForeignKey<BookToBookStoreRecord, BookStoreRecord> FK_B2BS_BOOK_STORE = createForeignKey(
sample.jooq.domain.Keys.CONSTRAINT_F, BookToBookStore.BOOK_TO_BOOK_STORE,
BookToBookStore.BOOK_TO_BOOK_STORE.NAME);
public static final ForeignKey<BookToBookStoreRecord, BookRecord> FK_B2BS_BOOK = createForeignKey(
sample.jooq.domain.Keys.CONSTRAINT_1, BookToBookStore.BOOK_TO_BOOK_STORE,
BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID);
}
}

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -19,17 +18,10 @@ import sample.jooq.domain.tables.BookStore;
import sample.jooq.domain.tables.BookToBookStore;
import sample.jooq.domain.tables.Language;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Public extends SchemaImpl {
@ -55,11 +47,7 @@ public class Public extends SchemaImpl {
}
private final List<Table<?>> getTables0() {
return Arrays.<Table<?>>asList(
Language.LANGUAGE,
Author.AUTHOR,
Book.BOOK,
BookStore.BOOK_STORE,
BookToBookStore.BOOK_TO_BOOK_STORE);
return Arrays.<Table<?>>asList(Language.LANGUAGE, Author.AUTHOR, Book.BOOK,
BookStore.BOOK_STORE, BookToBookStore.BOOK_TO_BOOK_STORE);
}
}

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain;
import javax.annotation.Generated;
import sample.jooq.domain.tables.Author;
@ -12,17 +11,10 @@ import sample.jooq.domain.tables.BookStore;
import sample.jooq.domain.tables.BookToBookStore;
import sample.jooq.domain.tables.Language;
/**
* Convenience access to all tables in PUBLIC
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables {

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain.tables;
import java.sql.Date;
import java.util.Arrays;
import java.util.List;
@ -20,17 +19,10 @@ import sample.jooq.domain.Keys;
import sample.jooq.domain.Public;
import sample.jooq.domain.tables.records.AuthorRecord;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Author extends TableImpl<AuthorRecord> {
@ -52,32 +44,38 @@ public class Author extends TableImpl<AuthorRecord> {
/**
* The column <code>PUBLIC.AUTHOR.ID</code>.
*/
public final TableField<AuthorRecord, Integer> ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
public final TableField<AuthorRecord, Integer> ID = createField("ID",
org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.AUTHOR.FIRST_NAME</code>.
*/
public final TableField<AuthorRecord, String> FIRST_NAME = createField("FIRST_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
public final TableField<AuthorRecord, String> FIRST_NAME = createField("FIRST_NAME",
org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
/**
* The column <code>PUBLIC.AUTHOR.LAST_NAME</code>.
*/
public final TableField<AuthorRecord, String> LAST_NAME = createField("LAST_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(50).nullable(false), this, "");
public final TableField<AuthorRecord, String> LAST_NAME = createField("LAST_NAME",
org.jooq.impl.SQLDataType.VARCHAR.length(50).nullable(false), this, "");
/**
* The column <code>PUBLIC.AUTHOR.DATE_OF_BIRTH</code>.
*/
public final TableField<AuthorRecord, Date> DATE_OF_BIRTH = createField("DATE_OF_BIRTH", org.jooq.impl.SQLDataType.DATE, this, "");
public final TableField<AuthorRecord, Date> DATE_OF_BIRTH = createField(
"DATE_OF_BIRTH", org.jooq.impl.SQLDataType.DATE, this, "");
/**
* The column <code>PUBLIC.AUTHOR.YEAR_OF_BIRTH</code>.
*/
public final TableField<AuthorRecord, Integer> YEAR_OF_BIRTH = createField("YEAR_OF_BIRTH", org.jooq.impl.SQLDataType.INTEGER, this, "");
public final TableField<AuthorRecord, Integer> YEAR_OF_BIRTH = createField(
"YEAR_OF_BIRTH", org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* The column <code>PUBLIC.AUTHOR.DISTINGUISHED</code>.
*/
public final TableField<AuthorRecord, Byte> DISTINGUISHED = createField("DISTINGUISHED", org.jooq.impl.SQLDataType.TINYINT, this, "");
public final TableField<AuthorRecord, Byte> DISTINGUISHED = createField(
"DISTINGUISHED", org.jooq.impl.SQLDataType.TINYINT, this, "");
/**
* Create a <code>PUBLIC.AUTHOR</code> table reference

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain.tables;
import java.util.Arrays;
import java.util.List;
@ -20,17 +19,10 @@ import sample.jooq.domain.Keys;
import sample.jooq.domain.Public;
import sample.jooq.domain.tables.records.BookRecord;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Book extends TableImpl<BookRecord> {
@ -52,27 +44,32 @@ public class Book extends TableImpl<BookRecord> {
/**
* The column <code>PUBLIC.BOOK.ID</code>.
*/
public final TableField<BookRecord, Integer> ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
public final TableField<BookRecord, Integer> ID = createField("ID",
org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK.AUTHOR_ID</code>.
*/
public final TableField<BookRecord, Integer> AUTHOR_ID = createField("AUTHOR_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
public final TableField<BookRecord, Integer> AUTHOR_ID = createField("AUTHOR_ID",
org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK.TITLE</code>.
*/
public final TableField<BookRecord, String> TITLE = createField("TITLE", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, "");
public final TableField<BookRecord, String> TITLE = createField("TITLE",
org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK.PUBLISHED_IN</code>.
*/
public final TableField<BookRecord, Integer> PUBLISHED_IN = createField("PUBLISHED_IN", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
public final TableField<BookRecord, Integer> PUBLISHED_IN = createField(
"PUBLISHED_IN", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK.LANGUAGE_ID</code>.
*/
public final TableField<BookRecord, Integer> LANGUAGE_ID = createField("LANGUAGE_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
public final TableField<BookRecord, Integer> LANGUAGE_ID = createField("LANGUAGE_ID",
org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* Create a <code>PUBLIC.BOOK</code> table reference
@ -117,7 +114,8 @@ public class Book extends TableImpl<BookRecord> {
*/
@Override
public List<ForeignKey<BookRecord, ?>> getReferences() {
return Arrays.<ForeignKey<BookRecord, ?>>asList(Keys.FK_BOOK_AUTHOR, Keys.FK_BOOK_LANGUAGE);
return Arrays.<ForeignKey<BookRecord, ?>>asList(Keys.FK_BOOK_AUTHOR,
Keys.FK_BOOK_LANGUAGE);
}
/**

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain.tables;
import java.util.Arrays;
import java.util.List;
@ -19,17 +18,10 @@ import sample.jooq.domain.Keys;
import sample.jooq.domain.Public;
import sample.jooq.domain.tables.records.BookStoreRecord;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class BookStore extends TableImpl<BookStoreRecord> {
@ -51,7 +43,8 @@ public class BookStore extends TableImpl<BookStoreRecord> {
/**
* The column <code>PUBLIC.BOOK_STORE.NAME</code>.
*/
public final TableField<BookStoreRecord, String> NAME = createField("NAME", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, "");
public final TableField<BookStoreRecord, String> NAME = createField("NAME",
org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, "");
/**
* Create a <code>PUBLIC.BOOK_STORE</code> table reference

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain.tables;
import java.util.Arrays;
import java.util.List;
@ -20,17 +19,10 @@ import sample.jooq.domain.Keys;
import sample.jooq.domain.Public;
import sample.jooq.domain.tables.records.BookToBookStoreRecord;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class BookToBookStore extends TableImpl<BookToBookStoreRecord> {
@ -52,17 +44,20 @@ public class BookToBookStore extends TableImpl<BookToBookStoreRecord> {
/**
* The column <code>PUBLIC.BOOK_TO_BOOK_STORE.NAME</code>.
*/
public final TableField<BookToBookStoreRecord, String> NAME = createField("NAME", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, "");
public final TableField<BookToBookStoreRecord, String> NAME = createField("NAME",
org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK_TO_BOOK_STORE.BOOK_ID</code>.
*/
public final TableField<BookToBookStoreRecord, Integer> BOOK_ID = createField("BOOK_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
public final TableField<BookToBookStoreRecord, Integer> BOOK_ID = createField(
"BOOK_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK_TO_BOOK_STORE.STOCK</code>.
*/
public final TableField<BookToBookStoreRecord, Integer> STOCK = createField("STOCK", org.jooq.impl.SQLDataType.INTEGER, this, "");
public final TableField<BookToBookStoreRecord, Integer> STOCK = createField("STOCK",
org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* Create a <code>PUBLIC.BOOK_TO_BOOK_STORE</code> table reference
@ -82,7 +77,8 @@ public class BookToBookStore extends TableImpl<BookToBookStoreRecord> {
this(alias, aliased, null);
}
private BookToBookStore(String alias, Table<BookToBookStoreRecord> aliased, Field<?>[] parameters) {
private BookToBookStore(String alias, Table<BookToBookStoreRecord> aliased,
Field<?>[] parameters) {
super(alias, Public.PUBLIC, aliased, parameters, "");
}
@ -107,7 +103,8 @@ public class BookToBookStore extends TableImpl<BookToBookStoreRecord> {
*/
@Override
public List<ForeignKey<BookToBookStoreRecord, ?>> getReferences() {
return Arrays.<ForeignKey<BookToBookStoreRecord, ?>>asList(Keys.FK_B2BS_BOOK_STORE, Keys.FK_B2BS_BOOK);
return Arrays.<ForeignKey<BookToBookStoreRecord, ?>>asList(
Keys.FK_B2BS_BOOK_STORE, Keys.FK_B2BS_BOOK);
}
/**

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain.tables;
import java.util.Arrays;
import java.util.List;
@ -19,17 +18,10 @@ import sample.jooq.domain.Keys;
import sample.jooq.domain.Public;
import sample.jooq.domain.tables.records.LanguageRecord;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Language extends TableImpl<LanguageRecord> {
@ -51,17 +43,20 @@ public class Language extends TableImpl<LanguageRecord> {
/**
* The column <code>PUBLIC.LANGUAGE.ID</code>.
*/
public final TableField<LanguageRecord, Integer> ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
public final TableField<LanguageRecord, Integer> ID = createField("ID",
org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.LANGUAGE.CD</code>.
*/
public final TableField<LanguageRecord, String> CD = createField("CD", org.jooq.impl.SQLDataType.CHAR.length(2).nullable(false), this, "");
public final TableField<LanguageRecord, String> CD = createField("CD",
org.jooq.impl.SQLDataType.CHAR.length(2).nullable(false), this, "");
/**
* The column <code>PUBLIC.LANGUAGE.DESCRIPTION</code>.
*/
public final TableField<LanguageRecord, String> DESCRIPTION = createField("DESCRIPTION", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
public final TableField<LanguageRecord, String> DESCRIPTION = createField(
"DESCRIPTION", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
/**
* Create a <code>PUBLIC.LANGUAGE</code> table reference

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain.tables.records;
import java.sql.Date;
import javax.annotation.Generated;
@ -16,19 +15,13 @@ import org.jooq.impl.UpdatableRecordImpl;
import sample.jooq.domain.tables.Author;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class AuthorRecord extends UpdatableRecordImpl<AuthorRecord> implements Record6<Integer, String, String, Date, Integer, Byte> {
public class AuthorRecord extends UpdatableRecordImpl<AuthorRecord> implements
Record6<Integer, String, String, Date, Integer, Byte> {
private static final long serialVersionUID = -983051550;
@ -302,7 +295,8 @@ public class AuthorRecord extends UpdatableRecordImpl<AuthorRecord> implements R
* {@inheritDoc}
*/
@Override
public AuthorRecord values(Integer value1, String value2, String value3, Date value4, Integer value5, Byte value6) {
public AuthorRecord values(Integer value1, String value2, String value3, Date value4,
Integer value5, Byte value6) {
value1(value1);
value2(value2);
value3(value3);
@ -326,7 +320,8 @@ public class AuthorRecord extends UpdatableRecordImpl<AuthorRecord> implements R
/**
* Create a detached, initialised AuthorRecord
*/
public AuthorRecord(Integer id, String firstName, String lastName, Date dateOfBirth, Integer yearOfBirth, Byte distinguished) {
public AuthorRecord(Integer id, String firstName, String lastName, Date dateOfBirth,
Integer yearOfBirth, Byte distinguished) {
super(Author.AUTHOR);
setValue(0, id);

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain.tables.records;
import javax.annotation.Generated;
import org.jooq.Field;
@ -14,19 +13,13 @@ import org.jooq.impl.UpdatableRecordImpl;
import sample.jooq.domain.tables.Book;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class BookRecord extends UpdatableRecordImpl<BookRecord> implements Record5<Integer, Integer, String, Integer, Integer> {
public class BookRecord extends UpdatableRecordImpl<BookRecord> implements
Record5<Integer, Integer, String, Integer, Integer> {
private static final long serialVersionUID = 220424682;
@ -261,7 +254,8 @@ public class BookRecord extends UpdatableRecordImpl<BookRecord> implements Recor
* {@inheritDoc}
*/
@Override
public BookRecord values(Integer value1, Integer value2, String value3, Integer value4, Integer value5) {
public BookRecord values(Integer value1, Integer value2, String value3,
Integer value4, Integer value5) {
value1(value1);
value2(value2);
value3(value3);
@ -284,7 +278,8 @@ public class BookRecord extends UpdatableRecordImpl<BookRecord> implements Recor
/**
* Create a detached, initialised BookRecord
*/
public BookRecord(Integer id, Integer authorId, String title, Integer publishedIn, Integer languageId) {
public BookRecord(Integer id, Integer authorId, String title, Integer publishedIn,
Integer languageId) {
super(Book.BOOK);
setValue(0, id);

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain.tables.records;
import javax.annotation.Generated;
import org.jooq.Field;
@ -13,19 +12,13 @@ import org.jooq.impl.TableRecordImpl;
import sample.jooq.domain.tables.BookStore;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class BookStoreRecord extends TableRecordImpl<BookStoreRecord> implements Record1<String> {
public class BookStoreRecord extends TableRecordImpl<BookStoreRecord> implements
Record1<String> {
private static final long serialVersionUID = -1969224219;

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain.tables.records;
import javax.annotation.Generated;
import org.jooq.Field;
@ -14,19 +13,13 @@ import org.jooq.impl.UpdatableRecordImpl;
import sample.jooq.domain.tables.BookToBookStore;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class BookToBookStoreRecord extends UpdatableRecordImpl<BookToBookStoreRecord> implements Record3<String, Integer, Integer> {
public class BookToBookStoreRecord extends UpdatableRecordImpl<BookToBookStoreRecord>
implements Record3<String, Integer, Integer> {
private static final long serialVersionUID = 1124329527;

View File

@ -3,7 +3,6 @@
*/
package sample.jooq.domain.tables.records;
import javax.annotation.Generated;
import org.jooq.Field;
@ -14,19 +13,13 @@ import org.jooq.impl.UpdatableRecordImpl;
import sample.jooq.domain.tables.Language;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.6.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org", "jOOQ version:3.6.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class LanguageRecord extends UpdatableRecordImpl<LanguageRecord> implements Record3<Integer, String, String> {
public class LanguageRecord extends UpdatableRecordImpl<LanguageRecord> implements
Record3<Integer, String, String> {
private static final long serialVersionUID = -1003202585;

View File

@ -43,8 +43,7 @@ import static org.junit.Assert.assertEquals;
* @author Dave Syer
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration({ SampleSecureApplication.class,
TestConfiguration.class })
@SpringApplicationConfiguration({ SampleSecureApplication.class, TestConfiguration.class })
public class SampleSecureApplicationTests {
@Autowired

View File

@ -31,7 +31,7 @@ import java.util.Map;
* @since 1.3.0
*/
@SuppressWarnings("serial")
public class ValueProvider implements Serializable{
public class ValueProvider implements Serializable {
private String name;

View File

@ -138,18 +138,18 @@ public class ConfigurationMetadata {
it.remove();
}
}
if (candidates.size() == 1) {
if (candidates.size() == 1) {
return candidates.get(0);
}
for (ItemMetadata candidate : candidates) {
if (ObjectUtils.nullSafeEquals(candidate.getSourceType(), metadata.getSourceType())) {
if (ObjectUtils.nullSafeEquals(candidate.getSourceType(),
metadata.getSourceType())) {
return candidate;
}
}
return null;
}
public static String nestedPrefix(String prefix, String name) {
String nestedPrefix = (prefix == null ? "" : prefix);
String dashedName = toDashedCase(name);

View File

@ -79,7 +79,7 @@ public class ItemHint implements Comparable<ItemHint> {
public static ItemHint newHint(String name, ValueHint... values) {
return new ItemHint(name, Arrays.asList(values),
Collections.<ValueProvider> emptyList());
Collections.<ValueProvider>emptyList());
}
@Override

View File

@ -348,8 +348,8 @@ public class ConfigurationMetadataAnnotationProcessorTests {
@Test
public void mergingOfAdditionalProperty() throws Exception {
ItemMetadata property = ItemMetadata.newProperty(null, "foo",
"java.lang.String", AdditionalMetadata.class.getName(), null, null, null,null);
ItemMetadata property = ItemMetadata.newProperty(null, "foo", "java.lang.String",
AdditionalMetadata.class.getName(), null, null, null, null);
writeAdditionalMetadata(property);
ConfigurationMetadata metadata = compile(SimpleProperties.class);
assertThat(metadata, containsProperty("simple.comparator"));
@ -360,16 +360,15 @@ public class ConfigurationMetadataAnnotationProcessorTests {
@Test
public void mergeExistingPropertyDefaultValue() throws Exception {
ItemMetadata property = ItemMetadata.newProperty("simple", "flag", null,
null, null, null, true, null);
ItemMetadata property = ItemMetadata.newProperty("simple", "flag", null, null,
null, null, true, null);
writeAdditionalMetadata(property);
ConfigurationMetadata metadata = compile(SimpleProperties.class);
assertThat(
metadata,
containsProperty("simple.flag", Boolean.class)
.fromSource(SimpleProperties.class)
.withDescription("A simple flag.")
.withDefaultValue(is(true)));
.withDescription("A simple flag.").withDefaultValue(is(true)));
assertThat(metadata.getItems().size(), is(4));
}
@ -382,8 +381,8 @@ public class ConfigurationMetadataAnnotationProcessorTests {
assertThat(
metadata,
containsProperty("simple.comparator", "java.util.Comparator<?>")
.fromSource(SimpleProperties.class)
.withDescription("A nice comparator."));
.fromSource(SimpleProperties.class).withDescription(
"A nice comparator."));
assertThat(metadata.getItems().size(), is(4));
}
@ -397,23 +396,23 @@ public class ConfigurationMetadataAnnotationProcessorTests {
assertThat(
metadata,
containsProperty("simple.comparator", "java.util.Comparator<?>")
.fromSource(SimpleProperties.class)
.withDeprecation("Don't use this.", "simple.complex-comparator"));
.fromSource(SimpleProperties.class).withDeprecation(
"Don't use this.", "simple.complex-comparator"));
assertThat(metadata.getItems().size(), is(4));
}
@Test
public void mergeExistingPropertyDeprecationOverride() throws Exception {
ItemMetadata property = ItemMetadata.newProperty("singledeprecated", "name", null,
null, null, null, null, new ItemDeprecation("Don't use this.",
ItemMetadata property = ItemMetadata.newProperty("singledeprecated", "name",
null, null, null, null, null, new ItemDeprecation("Don't use this.",
"single.name"));
writeAdditionalMetadata(property);
ConfigurationMetadata metadata = compile(DeprecatedSingleProperty.class);
assertThat(
metadata,
containsProperty("singledeprecated.name", String.class.getName())
.fromSource(DeprecatedSingleProperty.class)
.withDeprecation("Don't use this.", "single.name"));
.fromSource(DeprecatedSingleProperty.class).withDeprecation(
"Don't use this.", "single.name"));
assertThat(metadata.getItems().size(), is(3));
}
@ -461,9 +460,9 @@ public class ConfigurationMetadataAnnotationProcessorTests {
@Test
public void mergingOfHintWithProvider() throws Exception {
writeAdditionalHints(new ItemHint("simple.theName",
Collections.<ItemHint.ValueHint> emptyList(), Arrays.asList(
Collections.<ItemHint.ValueHint>emptyList(), Arrays.asList(
new ItemHint.ValueProvider("first", Collections
.<String, Object> singletonMap("target", "org.foo")),
.<String, Object>singletonMap("target", "org.foo")),
new ItemHint.ValueProvider("second", null))));
ConfigurationMetadata metadata = compile(SimpleProperties.class);
assertThat(

View File

@ -60,7 +60,7 @@ public class JsonMarshallerTests {
metadata.add(ItemHint.newHint("c", new ItemHint.ValueHint(123, "hey"),
new ItemHint.ValueHint(456, null)));
metadata.add(new ItemHint("d", null, Arrays.asList(new ItemHint.ValueProvider(
"first", Collections.<String, Object> singletonMap("target", "foo")),
"first", Collections.<String, Object>singletonMap("target", "foo")),
new ItemHint.ValueProvider("second", null))));
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
JsonMarshaller marshaller = new JsonMarshaller();

View File

@ -93,7 +93,7 @@ public abstract class ManagedDependencies implements Dependencies {
* @see #get(Collection)
*/
public static ManagedDependencies get() {
return get(Collections.<Dependencies>emptySet());
return get(Collections.<Dependencies> emptySet());
}
/**

View File

@ -35,7 +35,7 @@ public class ManagedDependenciesDelegateTests {
PropertiesFileDependencies extra = new PropertiesFileDependencies(getClass()
.getResourceAsStream("additional-external.properties"));
this.dependencies = new ManagedDependenciesDelegate(root,
Collections.<Dependencies>singleton(extra));
Collections.<Dependencies> singleton(extra));
}
@Test

View File

@ -54,7 +54,7 @@ public class BootRunTask extends JavaExec {
@Override
public void exec() {
if(System.console() != null) {
if (System.console() != null) {
// Record that the console is available here for AnsiOutput to detect later
this.getEnvironment().put("spring.output.ansi.console-available", true);
}

View File

@ -167,8 +167,8 @@ public abstract class SystemPropertyUtils {
/**
* Search the System properties and environment variables for a value with the
* provided key. Environment variables in {@code UPPER_CASE} style are allowed
* where System properties would normally be {@code lower.case}.
* provided key. Environment variables in {@code UPPER_CASE} style are allowed where
* System properties would normally be {@code lower.case}.
* @param key the key to resolve
* @param defaultValue the default value
* @param text optional extra context for an error message if the key resolution fails

View File

@ -121,9 +121,10 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
private LayoutType layout;
/**
* A list of the libraries that must be unpacked from fat jars in order to run. Specify
* each library as a <code>&lt;dependency&gt;</code> with a <code>&lt;groupId&gt;</code> and a
* <code>&lt;artifactId&gt;</code> and they will be unpacked at runtime in <code>$TMPDIR/spring-boot-libs</code>.
* A list of the libraries that must be unpacked from fat jars in order to run.
* Specify each library as a <code>&lt;dependency&gt;</code> with a
* <code>&lt;groupId&gt;</code> and a <code>&lt;artifactId&gt;</code> and they will be
* unpacked at runtime in <code>$TMPDIR/spring-boot-libs</code>.
* @since 1.1
*/
@Parameter

View File

@ -83,7 +83,7 @@ public class PropertySourcesPropertyValues implements PropertyValues {
Assert.notNull(propertySources, "PropertySources must not be null");
Assert.notNull(includes, "Includes must not be null");
this.propertySources = propertySources;
this.propertyNames = (propertyNames == null ? Collections.<String> emptySet()
this.propertyNames = (propertyNames == null ? Collections.<String>emptySet()
: propertyNames);
this.includes = includes;
PropertySourcesPropertyResolver resolver = new PropertySourcesPropertyResolver(

View File

@ -22,8 +22,8 @@ import org.springframework.context.ConfigurableApplicationContext;
/**
* Event published as late as conceivably possible to indicate that the application is
* ready to service requests. The source of the event is the {@link SpringApplication}
* itself, but beware of modifying its internal state since all initialization steps
* will have been completed by then.
* itself, but beware of modifying its internal state since all initialization steps will
* have been completed by then.
*
* @author Stephane Nicoll
* @since 1.3.0

View File

@ -74,7 +74,7 @@ public class DefaultApplicationArgumentsTests {
ApplicationArguments arguments = new DefaultApplicationArguments(ARGS);
assertThat(arguments.getOptionValues("foo"), equalTo(Arrays.asList("bar", "baz")));
assertThat(arguments.getOptionValues("debug"),
equalTo(Collections.<String> emptyList()));
equalTo(Collections.<String>emptyList()));
assertThat(arguments.getOptionValues("spring"), equalTo(null));
}
@ -88,8 +88,7 @@ public class DefaultApplicationArgumentsTests {
public void getNoNonOptionArgs() throws Exception {
ApplicationArguments arguments = new DefaultApplicationArguments(
new String[] { "--debug" });
assertThat(arguments.getNonOptionArgs(),
equalTo(Collections.<String> emptyList()));
assertThat(arguments.getNonOptionArgs(), equalTo(Collections.<String>emptyList()));
}
}