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

Formatting

Browse Source
This commit is contained in:
Phillip Webb
2016-10-03 22:44:36 -07:00
parent f2b0fa284e
commit a2315378d4
16 changed files with 592 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java vendored
View File

@@ -268,9 +268,7 @@ public class CacheProperties {
private String spec;
@Deprecated
@DeprecatedConfigurationProperty(
reason = "Caffeine will supersede the Guava support in Spring Boot 2.0",
replacement = "spring.cache.caffeine.spec")
@DeprecatedConfigurationProperty(reason = "Caffeine will supersede the Guava support in Spring Boot 2.0", replacement = "spring.cache.caffeine.spec")
public String getSpec() {
return this.spec;
}

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java vendored
View File

@@ -69,8 +69,7 @@ public enum CacheType {
/**
* Guava backed caching.
*/
@Deprecated
GUAVA,
@Deprecated GUAVA,
/**
* Simple in-memory caching.

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
View File

@@ -205,8 +205,8 @@ public class MongoProperties {
try {
if (hasCustomAddress() || hasCustomCredentials()) {
if (this.uri != null) {
throw new IllegalStateException("Invalid mongo configuration, " +
"either uri or host/port/credentials must be specified");
throw new IllegalStateException("Invalid mongo configuration, "
+ "either uri or host/port/credentials must be specified");
}
if (options == null) {
options = MongoClientOptions.builder().build();

8
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java
View File

@@ -134,8 +134,8 @@ public class MongoPropertiesTests {
properties.setUsername("user");
properties.setPassword("secret".toCharArray());
this.thrown.expect(IllegalStateException.class);
this.thrown.expectMessage("Invalid mongo configuration, " +
"either uri or host/port/credentials must be specified");
this.thrown.expectMessage("Invalid mongo configuration, "
+ "either uri or host/port/credentials must be specified");
properties.createMongoClient(null, null);
}
@@ -146,8 +146,8 @@ public class MongoPropertiesTests {
properties.setHost("localhost");
properties.setPort(4567);
this.thrown.expect(IllegalStateException.class);
this.thrown.expectMessage("Invalid mongo configuration, " +
"either uri or host/port/credentials must be specified");
this.thrown.expectMessage("Invalid mongo configuration, "
+ "either uri or host/port/credentials must be specified");
properties.createMongoClient(null, null);
}

193
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java
View File

@@ -3,7 +3,6 @@
*/
package sample.jooq.domain;
import java.sql.Date;
import java.util.Arrays;
import java.util.List;
@@ -18,123 +17,123 @@ import org.jooq.TableField;
import org.jooq.UniqueKey;
import org.jooq.impl.TableImpl;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.8.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org",
"jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Author extends TableImpl<Record> {
private static final long serialVersionUID = 1187406915;
private static final long serialVersionUID = 1187406915;
/**
* The reference instance of <code>PUBLIC.AUTHOR</code>
*/
public static final Author AUTHOR = new Author();
/**
* The reference instance of <code>PUBLIC.AUTHOR</code>
*/
public static final Author AUTHOR = new Author();
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The column <code>PUBLIC.AUTHOR.ID</code>.
*/
public final TableField<Record, Integer> ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.AUTHOR.ID</code>.
*/
public final TableField<Record, Integer> ID = createField("ID",
org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.AUTHOR.FIRST_NAME</code>.
*/
public final TableField<Record, String> FIRST_NAME = createField("FIRST_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
/**
* The column <code>PUBLIC.AUTHOR.FIRST_NAME</code>.
*/
public final TableField<Record, 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<Record, String> LAST_NAME = createField("LAST_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(50).nullable(false), this, "");
/**
* The column <code>PUBLIC.AUTHOR.LAST_NAME</code>.
*/
public final TableField<Record, 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<Record, Date> DATE_OF_BIRTH = createField("DATE_OF_BIRTH", org.jooq.impl.SQLDataType.DATE, this, "");
/**
* The column <code>PUBLIC.AUTHOR.DATE_OF_BIRTH</code>.
*/
public final TableField<Record, 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<Record, Integer> YEAR_OF_BIRTH = createField("YEAR_OF_BIRTH", org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* The column <code>PUBLIC.AUTHOR.YEAR_OF_BIRTH</code>.
*/
public final TableField<Record, Integer> YEAR_OF_BIRTH = createField("YEAR_OF_BIRTH",
org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* The column <code>PUBLIC.AUTHOR.DISTINGUISHED</code>.
*/
public final TableField<Record, Byte> DISTINGUISHED = createField("DISTINGUISHED", org.jooq.impl.SQLDataType.TINYINT, this, "");
/**
* The column <code>PUBLIC.AUTHOR.DISTINGUISHED</code>.
*/
public final TableField<Record, Byte> DISTINGUISHED = createField("DISTINGUISHED",
org.jooq.impl.SQLDataType.TINYINT, this, "");
/**
* Create a <code>PUBLIC.AUTHOR</code> table reference
*/
public Author() {
this("AUTHOR", null);
}
/**
* Create a <code>PUBLIC.AUTHOR</code> table reference
*/
public Author() {
this("AUTHOR", null);
}
/**
* Create an aliased <code>PUBLIC.AUTHOR</code> table reference
*/
public Author(String alias) {
this(alias, AUTHOR);
}
/**
* Create an aliased <code>PUBLIC.AUTHOR</code> table reference
*/
public Author(String alias) {
this(alias, AUTHOR);
}
private Author(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private Author(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private Author(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "");
}
private Author(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "");
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Public.PUBLIC;
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Public.PUBLIC;
}
/**
* {@inheritDoc}
*/
@Override
public UniqueKey<Record> getPrimaryKey() {
return Keys.CONSTRAINT_7;
}
/**
* {@inheritDoc}
*/
@Override
public UniqueKey<Record> getPrimaryKey() {
return Keys.CONSTRAINT_7;
}
/**
* {@inheritDoc}
*/
@Override
public List<UniqueKey<Record>> getKeys() {
return Arrays.<UniqueKey<Record>>asList(Keys.CONSTRAINT_7);
}
/**
* {@inheritDoc}
*/
@Override
public List<UniqueKey<Record>> getKeys() {
return Arrays.<UniqueKey<Record>>asList(Keys.CONSTRAINT_7);
}
/**
* {@inheritDoc}
*/
@Override
public Author as(String alias) {
return new Author(alias, this);
}
/**
* {@inheritDoc}
*/
@Override
public Author as(String alias) {
return new Author(alias, this);
}
/**
* Rename this table
*/
public Author rename(String name) {
return new Author(name, null);
}
/**
* Rename this table
*/
public Author rename(String name) {
return new Author(name, null);
}
}

199
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java
View File

@@ -3,7 +3,6 @@
*/
package sample.jooq.domain;
import java.util.Arrays;
import java.util.List;
@@ -18,126 +17,126 @@ import org.jooq.TableField;
import org.jooq.UniqueKey;
import org.jooq.impl.TableImpl;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.8.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org",
"jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Book extends TableImpl<Record> {
private static final long serialVersionUID = 1176189796;
private static final long serialVersionUID = 1176189796;
/**
* The reference instance of <code>PUBLIC.BOOK</code>
*/
public static final Book BOOK = new Book();
/**
* The reference instance of <code>PUBLIC.BOOK</code>
*/
public static final Book BOOK = new Book();
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The column <code>PUBLIC.BOOK.ID</code>.
*/
public final TableField<Record, Integer> ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK.ID</code>.
*/
public final TableField<Record, Integer> ID = createField("ID",
org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK.AUTHOR_ID</code>.
*/
public final TableField<Record, Integer> AUTHOR_ID = createField("AUTHOR_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK.AUTHOR_ID</code>.
*/
public final TableField<Record, Integer> AUTHOR_ID = createField("AUTHOR_ID",
org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK.TITLE</code>.
*/
public final TableField<Record, String> TITLE = createField("TITLE", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK.TITLE</code>.
*/
public final TableField<Record, 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<Record, Integer> PUBLISHED_IN = createField("PUBLISHED_IN", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK.PUBLISHED_IN</code>.
*/
public final TableField<Record, 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<Record, Integer> LANGUAGE_ID = createField("LANGUAGE_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK.LANGUAGE_ID</code>.
*/
public final TableField<Record, Integer> LANGUAGE_ID = createField("LANGUAGE_ID",
org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* Create a <code>PUBLIC.BOOK</code> table reference
*/
public Book() {
this("BOOK", null);
}
/**
* Create a <code>PUBLIC.BOOK</code> table reference
*/
public Book() {
this("BOOK", null);
}
/**
* Create an aliased <code>PUBLIC.BOOK</code> table reference
*/
public Book(String alias) {
this(alias, BOOK);
}
/**
* Create an aliased <code>PUBLIC.BOOK</code> table reference
*/
public Book(String alias) {
this(alias, BOOK);
}
private Book(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private Book(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private Book(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "");
}
private Book(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "");
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Public.PUBLIC;
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Public.PUBLIC;
}
/**
* {@inheritDoc}
*/
@Override
public UniqueKey<Record> getPrimaryKey() {
return Keys.CONSTRAINT_1;
}
/**
* {@inheritDoc}
*/
@Override
public UniqueKey<Record> getPrimaryKey() {
return Keys.CONSTRAINT_1;
}
/**
* {@inheritDoc}
*/
@Override
public List<UniqueKey<Record>> getKeys() {
return Arrays.<UniqueKey<Record>>asList(Keys.CONSTRAINT_1);
}
/**
* {@inheritDoc}
*/
@Override
public List<UniqueKey<Record>> getKeys() {
return Arrays.<UniqueKey<Record>>asList(Keys.CONSTRAINT_1);
}
/**
* {@inheritDoc}
*/
@Override
public List<ForeignKey<Record, ?>> getReferences() {
return Arrays.<ForeignKey<Record, ?>>asList(Keys.FK_BOOK_AUTHOR, Keys.FK_BOOK_LANGUAGE);
}
/**
* {@inheritDoc}
*/
@Override
public List<ForeignKey<Record, ?>> getReferences() {
return Arrays.<ForeignKey<Record, ?>>asList(Keys.FK_BOOK_AUTHOR,
Keys.FK_BOOK_LANGUAGE);
}
/**
* {@inheritDoc}
*/
@Override
public Book as(String alias) {
return new Book(alias, this);
}
/**
* {@inheritDoc}
*/
@Override
public Book as(String alias) {
return new Book(alias, this);
}
/**
* Rename this table
*/
public Book rename(String name) {
return new Book(name, null);
}
/**
* Rename this table
*/
public Book rename(String name) {
return new Book(name, null);
}
}

134
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java
View File

@@ -3,7 +3,6 @@
*/
package sample.jooq.domain;
import java.util.Arrays;
import java.util.List;
@@ -17,90 +16,85 @@ import org.jooq.TableField;
import org.jooq.UniqueKey;
import org.jooq.impl.TableImpl;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.8.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org",
"jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class BookStore extends TableImpl<Record> {
private static final long serialVersionUID = -2132596210;
private static final long serialVersionUID = -2132596210;
/**
* The reference instance of <code>PUBLIC.BOOK_STORE</code>
*/
public static final BookStore BOOK_STORE = new BookStore();
/**
* The reference instance of <code>PUBLIC.BOOK_STORE</code>
*/
public static final BookStore BOOK_STORE = new BookStore();
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The column <code>PUBLIC.BOOK_STORE.NAME</code>.
*/
public final TableField<Record, String> NAME = createField("NAME", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK_STORE.NAME</code>.
*/
public final TableField<Record, String> NAME = createField("NAME",
org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, "");
/**
* Create a <code>PUBLIC.BOOK_STORE</code> table reference
*/
public BookStore() {
this("BOOK_STORE", null);
}
/**
* Create a <code>PUBLIC.BOOK_STORE</code> table reference
*/
public BookStore() {
this("BOOK_STORE", null);
}
/**
* Create an aliased <code>PUBLIC.BOOK_STORE</code> table reference
*/
public BookStore(String alias) {
this(alias, BOOK_STORE);
}
/**
* Create an aliased <code>PUBLIC.BOOK_STORE</code> table reference
*/
public BookStore(String alias) {
this(alias, BOOK_STORE);
}
private BookStore(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private BookStore(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private BookStore(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "");
}
private BookStore(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "");
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Public.PUBLIC;
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Public.PUBLIC;
}
/**
* {@inheritDoc}
*/
@Override
public List<UniqueKey<Record>> getKeys() {
return Arrays.<UniqueKey<Record>>asList(Keys.CONSTRAINT_F);
}
/**
* {@inheritDoc}
*/
@Override
public List<UniqueKey<Record>> getKeys() {
return Arrays.<UniqueKey<Record>>asList(Keys.CONSTRAINT_F);
}
/**
* {@inheritDoc}
*/
@Override
public BookStore as(String alias) {
return new BookStore(alias, this);
}
/**
* {@inheritDoc}
*/
@Override
public BookStore as(String alias) {
return new BookStore(alias, this);
}
/**
* Rename this table
*/
public BookStore rename(String name) {
return new BookStore(name, null);
}
/**
* Rename this table
*/
public BookStore rename(String name) {
return new BookStore(name, null);
}
}

181
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java
View File

@@ -3,7 +3,6 @@
*/
package sample.jooq.domain;
import java.util.Arrays;
import java.util.List;
@@ -18,116 +17,114 @@ import org.jooq.TableField;
import org.jooq.UniqueKey;
import org.jooq.impl.TableImpl;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.8.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org",
"jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class BookToBookStore extends TableImpl<Record> {
private static final long serialVersionUID = -1360744633;
private static final long serialVersionUID = -1360744633;
/**
* The reference instance of <code>PUBLIC.BOOK_TO_BOOK_STORE</code>
*/
public static final BookToBookStore BOOK_TO_BOOK_STORE = new BookToBookStore();
/**
* The reference instance of <code>PUBLIC.BOOK_TO_BOOK_STORE</code>
*/
public static final BookToBookStore BOOK_TO_BOOK_STORE = new BookToBookStore();
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The column <code>PUBLIC.BOOK_TO_BOOK_STORE.NAME</code>.
*/
public final TableField<Record, String> NAME = createField("NAME", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK_TO_BOOK_STORE.NAME</code>.
*/
public final TableField<Record, 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<Record, Integer> BOOK_ID = createField("BOOK_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.BOOK_TO_BOOK_STORE.BOOK_ID</code>.
*/
public final TableField<Record, 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<Record, Integer> STOCK = createField("STOCK", org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* The column <code>PUBLIC.BOOK_TO_BOOK_STORE.STOCK</code>.
*/
public final TableField<Record, Integer> STOCK = createField("STOCK",
org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* Create a <code>PUBLIC.BOOK_TO_BOOK_STORE</code> table reference
*/
public BookToBookStore() {
this("BOOK_TO_BOOK_STORE", null);
}
/**
* Create a <code>PUBLIC.BOOK_TO_BOOK_STORE</code> table reference
*/
public BookToBookStore() {
this("BOOK_TO_BOOK_STORE", null);
}
/**
* Create an aliased <code>PUBLIC.BOOK_TO_BOOK_STORE</code> table reference
*/
public BookToBookStore(String alias) {
this(alias, BOOK_TO_BOOK_STORE);
}
/**
* Create an aliased <code>PUBLIC.BOOK_TO_BOOK_STORE</code> table reference
*/
public BookToBookStore(String alias) {
this(alias, BOOK_TO_BOOK_STORE);
}
private BookToBookStore(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private BookToBookStore(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private BookToBookStore(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "");
}
private BookToBookStore(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "");
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Public.PUBLIC;
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Public.PUBLIC;
}
/**
* {@inheritDoc}
*/
@Override
public UniqueKey<Record> getPrimaryKey() {
return Keys.CONSTRAINT_2;
}
/**
* {@inheritDoc}
*/
@Override
public UniqueKey<Record> getPrimaryKey() {
return Keys.CONSTRAINT_2;
}
/**
* {@inheritDoc}
*/
@Override
public List<UniqueKey<Record>> getKeys() {
return Arrays.<UniqueKey<Record>>asList(Keys.CONSTRAINT_2);
}
/**
* {@inheritDoc}
*/
@Override
public List<UniqueKey<Record>> getKeys() {
return Arrays.<UniqueKey<Record>>asList(Keys.CONSTRAINT_2);
}
/**
* {@inheritDoc}
*/
@Override
public List<ForeignKey<Record, ?>> getReferences() {
return Arrays.<ForeignKey<Record, ?>>asList(Keys.FK_B2BS_BOOK_STORE, Keys.FK_B2BS_BOOK);
}
/**
* {@inheritDoc}
*/
@Override
public List<ForeignKey<Record, ?>> getReferences() {
return Arrays.<ForeignKey<Record, ?>>asList(Keys.FK_B2BS_BOOK_STORE,
Keys.FK_B2BS_BOOK);
}
/**
* {@inheritDoc}
*/
@Override
public BookToBookStore as(String alias) {
return new BookToBookStore(alias, this);
}
/**
* {@inheritDoc}
*/
@Override
public BookToBookStore as(String alias) {
return new BookToBookStore(alias, this);
}
/**
* Rename this table
*/
public BookToBookStore rename(String name) {
return new BookToBookStore(name, null);
}
/**
* Rename this table
*/
public BookToBookStore rename(String name) {
return new BookToBookStore(name, null);
}
}

60
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/DefaultCatalog.java
View File

@@ -3,7 +3,6 @@
*/
package sample.jooq.domain;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -13,48 +12,41 @@ import javax.annotation.Generated;
import org.jooq.Schema;
import org.jooq.impl.CatalogImpl;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.8.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org",
"jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class DefaultCatalog extends CatalogImpl {
private static final long serialVersionUID = -1557925562;
private static final long serialVersionUID = -1557925562;
/**
* The reference instance of <code></code>
*/
public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog();
/**
* The reference instance of <code></code>
*/
public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog();
/**
* The schema <code>PUBLIC</code>.
*/
public final Public PUBLIC = sample.jooq.domain.Public.PUBLIC;
/**
* The schema <code>PUBLIC</code>.
*/
public final Public PUBLIC = sample.jooq.domain.Public.PUBLIC;
/**
* No further instances allowed
*/
private DefaultCatalog() {
super("");
}
/**
* No further instances allowed
*/
private DefaultCatalog() {
super("");
}
@Override
public final List<Schema> getSchemas() {
List result = new ArrayList();
result.addAll(getSchemas0());
return result;
}
@Override
public final List<Schema> getSchemas() {
List result = new ArrayList();
result.addAll(getSchemas0());
return result;
}
private final List<Schema> getSchemas0() {
return Arrays.<Schema>asList(
Public.PUBLIC);
}
private final List<Schema> getSchemas0() {
return Arrays.<Schema>asList(Public.PUBLIC);
}
}

97
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java
View File

@@ -3,7 +3,6 @@
*/
package sample.jooq.domain;
import javax.annotation.Generated;
import org.jooq.ForeignKey;
@@ -11,61 +10,69 @@ import org.jooq.Record;
import org.jooq.UniqueKey;
import org.jooq.impl.AbstractKeys;
/**
* 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.8.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org",
"jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Keys {
// -------------------------------------------------------------------------
// IDENTITY definitions
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
// IDENTITY definitions
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
// UNIQUE and PRIMARY KEY definitions
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
// UNIQUE and PRIMARY KEY definitions
// -------------------------------------------------------------------------
public static final UniqueKey<Record> CONSTRAINT_C = UniqueKeys0.CONSTRAINT_C;
public static final UniqueKey<Record> CONSTRAINT_7 = UniqueKeys0.CONSTRAINT_7;
public static final UniqueKey<Record> CONSTRAINT_1 = UniqueKeys0.CONSTRAINT_1;
public static final UniqueKey<Record> CONSTRAINT_F = UniqueKeys0.CONSTRAINT_F;
public static final UniqueKey<Record> CONSTRAINT_2 = UniqueKeys0.CONSTRAINT_2;
public static final UniqueKey<Record> CONSTRAINT_C = UniqueKeys0.CONSTRAINT_C;
public static final UniqueKey<Record> CONSTRAINT_7 = UniqueKeys0.CONSTRAINT_7;
public static final UniqueKey<Record> CONSTRAINT_1 = UniqueKeys0.CONSTRAINT_1;
public static final UniqueKey<Record> CONSTRAINT_F = UniqueKeys0.CONSTRAINT_F;
public static final UniqueKey<Record> CONSTRAINT_2 = UniqueKeys0.CONSTRAINT_2;
// -------------------------------------------------------------------------
// FOREIGN KEY definitions
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
// FOREIGN KEY definitions
// -------------------------------------------------------------------------
public static final ForeignKey<Record, Record> FK_BOOK_AUTHOR = ForeignKeys0.FK_BOOK_AUTHOR;
public static final ForeignKey<Record, Record> FK_BOOK_LANGUAGE = ForeignKeys0.FK_BOOK_LANGUAGE;
public static final ForeignKey<Record, Record> FK_B2BS_BOOK_STORE = ForeignKeys0.FK_B2BS_BOOK_STORE;
public static final ForeignKey<Record, Record> FK_B2BS_BOOK = ForeignKeys0.FK_B2BS_BOOK;
public static final ForeignKey<Record, Record> FK_BOOK_AUTHOR = ForeignKeys0.FK_BOOK_AUTHOR;
public static final ForeignKey<Record, Record> FK_BOOK_LANGUAGE = ForeignKeys0.FK_BOOK_LANGUAGE;
public static final ForeignKey<Record, Record> FK_B2BS_BOOK_STORE = ForeignKeys0.FK_B2BS_BOOK_STORE;
public static final ForeignKey<Record, Record> FK_B2BS_BOOK = ForeignKeys0.FK_B2BS_BOOK;
// -------------------------------------------------------------------------
// [#1459] distribute members to avoid static initialisers > 64kb
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
// [#1459] distribute members to avoid static initialisers > 64kb
// -------------------------------------------------------------------------
private static class UniqueKeys0 extends AbstractKeys {
public static final UniqueKey<Record> CONSTRAINT_C = createUniqueKey(
Language.LANGUAGE, "CONSTRAINT_C", Language.LANGUAGE.ID);
public static final UniqueKey<Record> CONSTRAINT_7 = createUniqueKey(
Author.AUTHOR, "CONSTRAINT_7", Author.AUTHOR.ID);
public static final UniqueKey<Record> CONSTRAINT_1 = createUniqueKey(Book.BOOK,
"CONSTRAINT_1", Book.BOOK.ID);
public static final UniqueKey<Record> CONSTRAINT_F = createUniqueKey(
BookStore.BOOK_STORE, "CONSTRAINT_F", BookStore.BOOK_STORE.NAME);
public static final UniqueKey<Record> CONSTRAINT_2 = createUniqueKey(
BookToBookStore.BOOK_TO_BOOK_STORE, "CONSTRAINT_2",
BookToBookStore.BOOK_TO_BOOK_STORE.NAME,
BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID);
}
private static class UniqueKeys0 extends AbstractKeys {
public static final UniqueKey<Record> CONSTRAINT_C = createUniqueKey(Language.LANGUAGE, "CONSTRAINT_C", Language.LANGUAGE.ID);
public static final UniqueKey<Record> CONSTRAINT_7 = createUniqueKey(Author.AUTHOR, "CONSTRAINT_7", Author.AUTHOR.ID);
public static final UniqueKey<Record> CONSTRAINT_1 = createUniqueKey(Book.BOOK, "CONSTRAINT_1", Book.BOOK.ID);
public static final UniqueKey<Record> CONSTRAINT_F = createUniqueKey(BookStore.BOOK_STORE, "CONSTRAINT_F", BookStore.BOOK_STORE.NAME);
public static final UniqueKey<Record> CONSTRAINT_2 = createUniqueKey(BookToBookStore.BOOK_TO_BOOK_STORE, "CONSTRAINT_2", BookToBookStore.BOOK_TO_BOOK_STORE.NAME, BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID);
}
private static class ForeignKeys0 extends AbstractKeys {
public static final ForeignKey<Record, Record> FK_BOOK_AUTHOR = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_7, Book.BOOK, "FK_BOOK_AUTHOR", Book.BOOK.AUTHOR_ID);
public static final ForeignKey<Record, Record> FK_BOOK_LANGUAGE = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_C, Book.BOOK, "FK_BOOK_LANGUAGE", Book.BOOK.LANGUAGE_ID);
public static final ForeignKey<Record, Record> FK_B2BS_BOOK_STORE = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_F, BookToBookStore.BOOK_TO_BOOK_STORE, "FK_B2BS_BOOK_STORE", BookToBookStore.BOOK_TO_BOOK_STORE.NAME);
public static final ForeignKey<Record, Record> FK_B2BS_BOOK = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_1, BookToBookStore.BOOK_TO_BOOK_STORE, "FK_B2BS_BOOK", BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID);
}
private static class ForeignKeys0 extends AbstractKeys {
public static final ForeignKey<Record, Record> FK_BOOK_AUTHOR = createForeignKey(
sample.jooq.domain.Keys.CONSTRAINT_7, Book.BOOK, "FK_BOOK_AUTHOR",
Book.BOOK.AUTHOR_ID);
public static final ForeignKey<Record, Record> FK_BOOK_LANGUAGE = createForeignKey(
sample.jooq.domain.Keys.CONSTRAINT_C, Book.BOOK, "FK_BOOK_LANGUAGE",
Book.BOOK.LANGUAGE_ID);
public static final ForeignKey<Record, Record> FK_B2BS_BOOK_STORE = createForeignKey(
sample.jooq.domain.Keys.CONSTRAINT_F, BookToBookStore.BOOK_TO_BOOK_STORE,
"FK_B2BS_BOOK_STORE", BookToBookStore.BOOK_TO_BOOK_STORE.NAME);
public static final ForeignKey<Record, Record> FK_B2BS_BOOK = createForeignKey(
sample.jooq.domain.Keys.CONSTRAINT_1, BookToBookStore.BOOK_TO_BOOK_STORE,
"FK_B2BS_BOOK", BookToBookStore.BOOK_TO_BOOK_STORE.BOOK_ID);
}
}

166
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java
View File

@@ -3,7 +3,6 @@
*/
package sample.jooq.domain;
import java.util.Arrays;
import java.util.List;
@@ -17,108 +16,105 @@ import org.jooq.TableField;
import org.jooq.UniqueKey;
import org.jooq.impl.TableImpl;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.8.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org",
"jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Language extends TableImpl<Record> {
private static final long serialVersionUID = -1890716744;
private static final long serialVersionUID = -1890716744;
/**
* The reference instance of <code>PUBLIC.LANGUAGE</code>
*/
public static final Language LANGUAGE = new Language();
/**
* The reference instance of <code>PUBLIC.LANGUAGE</code>
*/
public static final Language LANGUAGE = new Language();
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The class holding records for this type
*/
@Override
public Class<Record> getRecordType() {
return Record.class;
}
/**
* The column <code>PUBLIC.LANGUAGE.ID</code>.
*/
public final TableField<Record, Integer> ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.LANGUAGE.ID</code>.
*/
public final TableField<Record, Integer> ID = createField("ID",
org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>PUBLIC.LANGUAGE.CD</code>.
*/
public final TableField<Record, String> CD = createField("CD", org.jooq.impl.SQLDataType.CHAR.length(2).nullable(false), this, "");
/**
* The column <code>PUBLIC.LANGUAGE.CD</code>.
*/
public final TableField<Record, String> CD = createField("CD",
org.jooq.impl.SQLDataType.CHAR.length(2).nullable(false), this, "");
/**
* The column <code>PUBLIC.LANGUAGE.DESCRIPTION</code>.
*/
public final TableField<Record, String> DESCRIPTION = createField("DESCRIPTION", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
/**
* The column <code>PUBLIC.LANGUAGE.DESCRIPTION</code>.
*/
public final TableField<Record, String> DESCRIPTION = createField("DESCRIPTION",
org.jooq.impl.SQLDataType.VARCHAR.length(50), this, "");
/**
* Create a <code>PUBLIC.LANGUAGE</code> table reference
*/
public Language() {
this("LANGUAGE", null);
}
/**
* Create a <code>PUBLIC.LANGUAGE</code> table reference
*/
public Language() {
this("LANGUAGE", null);
}
/**
* Create an aliased <code>PUBLIC.LANGUAGE</code> table reference
*/
public Language(String alias) {
this(alias, LANGUAGE);
}
/**
* Create an aliased <code>PUBLIC.LANGUAGE</code> table reference
*/
public Language(String alias) {
this(alias, LANGUAGE);
}
private Language(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private Language(String alias, Table<Record> aliased) {
this(alias, aliased, null);
}
private Language(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "");
}
private Language(String alias, Table<Record> aliased, Field<?>[] parameters) {
super(alias, null, aliased, parameters, "");
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Public.PUBLIC;
}
/**
* {@inheritDoc}
*/
@Override
public Schema getSchema() {
return Public.PUBLIC;
}
/**
* {@inheritDoc}
*/
@Override
public UniqueKey<Record> getPrimaryKey() {
return Keys.CONSTRAINT_C;
}
/**
* {@inheritDoc}
*/
@Override
public UniqueKey<Record> getPrimaryKey() {
return Keys.CONSTRAINT_C;
}
/**
* {@inheritDoc}
*/
@Override
public List<UniqueKey<Record>> getKeys() {
return Arrays.<UniqueKey<Record>>asList(Keys.CONSTRAINT_C);
}
/**
* {@inheritDoc}
*/
@Override
public List<UniqueKey<Record>> getKeys() {
return Arrays.<UniqueKey<Record>>asList(Keys.CONSTRAINT_C);
}
/**
* {@inheritDoc}
*/
@Override
public Language as(String alias) {
return new Language(alias, this);
}
/**
* {@inheritDoc}
*/
@Override
public Language as(String alias) {
return new Language(alias, this);
}
/**
* Rename this table
*/
public Language rename(String name) {
return new Language(name, null);
}
/**
* Rename this table
*/
public Language rename(String name) {
return new Language(name, null);
}
}

112
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java
View File

@@ -3,7 +3,6 @@
*/
package sample.jooq.domain;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -14,81 +13,70 @@ import org.jooq.Catalog;
import org.jooq.Table;
import org.jooq.impl.SchemaImpl;
/**
* This class is generated by jOOQ.
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.8.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org",
"jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Public extends SchemaImpl {
private static final long serialVersionUID = 217498103;
private static final long serialVersionUID = 217498103;
/**
* The reference instance of <code>PUBLIC</code>
*/
public static final Public PUBLIC = new Public();
/**
* The reference instance of <code>PUBLIC</code>
*/
public static final Public PUBLIC = new Public();
/**
* The table <code>PUBLIC.LANGUAGE</code>.
*/
public final Language LANGUAGE = sample.jooq.domain.Language.LANGUAGE;
/**
* The table <code>PUBLIC.LANGUAGE</code>.
*/
public final Language LANGUAGE = sample.jooq.domain.Language.LANGUAGE;
/**
* The table <code>PUBLIC.AUTHOR</code>.
*/
public final Author AUTHOR = sample.jooq.domain.Author.AUTHOR;
/**
* The table <code>PUBLIC.AUTHOR</code>.
*/
public final Author AUTHOR = sample.jooq.domain.Author.AUTHOR;
/**
* The table <code>PUBLIC.BOOK</code>.
*/
public final Book BOOK = sample.jooq.domain.Book.BOOK;
/**
* The table <code>PUBLIC.BOOK</code>.
*/
public final Book BOOK = sample.jooq.domain.Book.BOOK;
/**
* The table <code>PUBLIC.BOOK_STORE</code>.
*/
public final BookStore BOOK_STORE = sample.jooq.domain.BookStore.BOOK_STORE;
/**
* The table <code>PUBLIC.BOOK_STORE</code>.
*/
public final BookStore BOOK_STORE = sample.jooq.domain.BookStore.BOOK_STORE;
/**
* The table <code>PUBLIC.BOOK_TO_BOOK_STORE</code>.
*/
public final BookToBookStore BOOK_TO_BOOK_STORE = sample.jooq.domain.BookToBookStore.BOOK_TO_BOOK_STORE;
/**
* The table <code>PUBLIC.BOOK_TO_BOOK_STORE</code>.
*/
public final BookToBookStore BOOK_TO_BOOK_STORE = sample.jooq.domain.BookToBookStore.BOOK_TO_BOOK_STORE;
/**
* No further instances allowed
*/
private Public() {
super("PUBLIC", null);
}
/**
* No further instances allowed
*/
private Public() {
super("PUBLIC", null);
}
/**
* {@inheritDoc}
*/
@Override
public Catalog getCatalog() {
return DefaultCatalog.DEFAULT_CATALOG;
}
/**
* {@inheritDoc}
*/
@Override
public Catalog getCatalog() {
return DefaultCatalog.DEFAULT_CATALOG;
}
@Override
public final List<Table<?>> getTables() {
List result = new ArrayList();
result.addAll(getTables0());
return result;
}
@Override
public final List<Table<?>> getTables() {
List result = new ArrayList();
result.addAll(getTables0());
return result;
}
private final List<Table<?>> getTables0() {
return Arrays.<Table<?>>asList(
Language.LANGUAGE,
Author.AUTHOR,
Book.BOOK,
BookStore.BOOK_STORE,
BookToBookStore.BOOK_TO_BOOK_STORE);
}
private final List<Table<?>> getTables0() {
return Arrays.<Table<?>>asList(Language.LANGUAGE, Author.AUTHOR, Book.BOOK,
BookStore.BOOK_STORE, BookToBookStore.BOOK_TO_BOOK_STORE);
}
}

51
spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java
View File

@@ -3,45 +3,38 @@
*/
package sample.jooq.domain;
import javax.annotation.Generated;
/**
* Convenience access to all tables in PUBLIC
*/
@Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.8.2"
},
comments = "This class is generated by jOOQ"
)
@Generated(value = { "http://www.jooq.org",
"jOOQ version:3.8.2" }, comments = "This class is generated by jOOQ")
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables {
/**
* The table <code>PUBLIC.LANGUAGE</code>.
*/
public static final Language LANGUAGE = sample.jooq.domain.Language.LANGUAGE;
/**
* The table <code>PUBLIC.LANGUAGE</code>.
*/
public static final Language LANGUAGE = sample.jooq.domain.Language.LANGUAGE;
/**
* The table <code>PUBLIC.AUTHOR</code>.
*/
public static final Author AUTHOR = sample.jooq.domain.Author.AUTHOR;
/**
* The table <code>PUBLIC.AUTHOR</code>.
*/
public static final Author AUTHOR = sample.jooq.domain.Author.AUTHOR;
/**
* The table <code>PUBLIC.BOOK</code>.
*/
public static final Book BOOK = sample.jooq.domain.Book.BOOK;
/**
* The table <code>PUBLIC.BOOK</code>.
*/
public static final Book BOOK = sample.jooq.domain.Book.BOOK;
/**
* The table <code>PUBLIC.BOOK_STORE</code>.
*/
public static final BookStore BOOK_STORE = sample.jooq.domain.BookStore.BOOK_STORE;
/**
* The table <code>PUBLIC.BOOK_STORE</code>.
*/
public static final BookStore BOOK_STORE = sample.jooq.domain.BookStore.BOOK_STORE;
/**
* The table <code>PUBLIC.BOOK_TO_BOOK_STORE</code>.
*/
public static final BookToBookStore BOOK_TO_BOOK_STORE = sample.jooq.domain.BookToBookStore.BOOK_TO_BOOK_STORE;
/**
* The table <code>PUBLIC.BOOK_TO_BOOK_STORE</code>.
*/
public static final BookToBookStore BOOK_TO_BOOK_STORE = sample.jooq.domain.BookToBookStore.BOOK_TO_BOOK_STORE;
}

3
spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java
View File

@@ -43,8 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = { SampleSecureApplication.class,
TestConfiguration.class })
@SpringBootTest(classes = { SampleSecureApplication.class, TestConfiguration.class })
public class SampleSecureApplicationTests {
@Autowired

3
spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java
View File

@@ -19,8 +19,7 @@ package org.springframework.boot.configurationsample.specific;
import org.springframework.boot.configurationsample.ConfigurationProperties;
/**
* Test that compilation fails if the same type is registered twice with the
* same prefix.
* Test that compilation fails if the same type is registered twice with the same prefix.
*
* @author Stephane Nicoll
*/

6
spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
View File

@@ -226,8 +226,7 @@ public class PropertiesConfigurationFactory<T>
}
public void bindPropertiesToTarget() throws BindException {
Assert.state(this.propertySources != null,
"PropertySources should not be null");
Assert.state(this.propertySources != null, "PropertySources should not be null");
try {
if (this.logger.isTraceEnabled()) {
this.logger.trace("Property Sources: " + this.propertySources);
@@ -262,7 +261,8 @@ public class PropertiesConfigurationFactory<T>
customizeBinder(dataBinder);
Iterable<String> relaxedTargetNames = getRelaxedTargetNames();
Set<String> names = getNames(relaxedTargetNames);
PropertyValues propertyValues = getPropertySourcesPropertyValues(names, relaxedTargetNames);
PropertyValues propertyValues = getPropertySourcesPropertyValues(names,
relaxedTargetNames);
dataBinder.bind(propertyValues);
if (this.validator != null) {
validate(dataBinder);