diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java index 347f42db4c..b351c40a91 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java @@ -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; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java index b5cfe8a254..52e2343801 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java @@ -69,8 +69,7 @@ public enum CacheType { /** * Guava backed caching. */ - @Deprecated - GUAVA, + @Deprecated GUAVA, /** * Simple in-memory caching. diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java index 14c829e954..b8a657b52f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java @@ -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(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java index 5a89fbb378..cd79c5e3b0 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java @@ -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); } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java index bad6cbd805..0052e031c3 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java @@ -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 { - private static final long serialVersionUID = 1187406915; - - /** - * The reference instance of PUBLIC.AUTHOR - */ - public static final Author AUTHOR = new Author(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return Record.class; - } - - /** - * The column PUBLIC.AUTHOR.ID. - */ - public final TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.AUTHOR.FIRST_NAME. - */ - public final TableField FIRST_NAME = createField("FIRST_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); - - /** - * The column PUBLIC.AUTHOR.LAST_NAME. - */ - public final TableField LAST_NAME = createField("LAST_NAME", org.jooq.impl.SQLDataType.VARCHAR.length(50).nullable(false), this, ""); - - /** - * The column PUBLIC.AUTHOR.DATE_OF_BIRTH. - */ - public final TableField DATE_OF_BIRTH = createField("DATE_OF_BIRTH", org.jooq.impl.SQLDataType.DATE, this, ""); - - /** - * The column PUBLIC.AUTHOR.YEAR_OF_BIRTH. - */ - public final TableField YEAR_OF_BIRTH = createField("YEAR_OF_BIRTH", org.jooq.impl.SQLDataType.INTEGER, this, ""); - - /** - * The column PUBLIC.AUTHOR.DISTINGUISHED. - */ - public final TableField DISTINGUISHED = createField("DISTINGUISHED", org.jooq.impl.SQLDataType.TINYINT, this, ""); - - /** - * Create a PUBLIC.AUTHOR table reference - */ - public Author() { - this("AUTHOR", null); - } - - /** - * Create an aliased PUBLIC.AUTHOR table reference - */ - public Author(String alias) { - this(alias, AUTHOR); - } - - private Author(String alias, Table aliased) { - this(alias, aliased, null); - } - - private Author(String alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Public.PUBLIC; - } - - /** - * {@inheritDoc} - */ - @Override - public UniqueKey getPrimaryKey() { - return Keys.CONSTRAINT_7; - } - - /** - * {@inheritDoc} - */ - @Override - public List> getKeys() { - return Arrays.>asList(Keys.CONSTRAINT_7); - } - - /** - * {@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); - } + private static final long serialVersionUID = 1187406915; + + /** + * The reference instance of PUBLIC.AUTHOR + */ + public static final Author AUTHOR = new Author(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return Record.class; + } + + /** + * The column PUBLIC.AUTHOR.ID. + */ + public final TableField ID = createField("ID", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column PUBLIC.AUTHOR.FIRST_NAME. + */ + public final TableField FIRST_NAME = createField("FIRST_NAME", + org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); + + /** + * The column PUBLIC.AUTHOR.LAST_NAME. + */ + public final TableField LAST_NAME = createField("LAST_NAME", + org.jooq.impl.SQLDataType.VARCHAR.length(50).nullable(false), this, ""); + + /** + * The column PUBLIC.AUTHOR.DATE_OF_BIRTH. + */ + public final TableField DATE_OF_BIRTH = createField("DATE_OF_BIRTH", + org.jooq.impl.SQLDataType.DATE, this, ""); + + /** + * The column PUBLIC.AUTHOR.YEAR_OF_BIRTH. + */ + public final TableField YEAR_OF_BIRTH = createField("YEAR_OF_BIRTH", + org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * The column PUBLIC.AUTHOR.DISTINGUISHED. + */ + public final TableField DISTINGUISHED = createField("DISTINGUISHED", + org.jooq.impl.SQLDataType.TINYINT, this, ""); + + /** + * Create a PUBLIC.AUTHOR table reference + */ + public Author() { + this("AUTHOR", null); + } + + /** + * Create an aliased PUBLIC.AUTHOR table reference + */ + public Author(String alias) { + this(alias, AUTHOR); + } + + private Author(String alias, Table aliased) { + this(alias, aliased, null); + } + + private Author(String alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return Public.PUBLIC; + } + + /** + * {@inheritDoc} + */ + @Override + public UniqueKey getPrimaryKey() { + return Keys.CONSTRAINT_7; + } + + /** + * {@inheritDoc} + */ + @Override + public List> getKeys() { + return Arrays.>asList(Keys.CONSTRAINT_7); + } + + /** + * {@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); + } } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java index c1956abc04..b987e2f5b6 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java @@ -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 { - private static final long serialVersionUID = 1176189796; - - /** - * The reference instance of PUBLIC.BOOK - */ - public static final Book BOOK = new Book(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return Record.class; - } - - /** - * The column PUBLIC.BOOK.ID. - */ - public final TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK.AUTHOR_ID. - */ - public final TableField AUTHOR_ID = createField("AUTHOR_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK.TITLE. - */ - public final TableField TITLE = createField("TITLE", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK.PUBLISHED_IN. - */ - public final TableField PUBLISHED_IN = createField("PUBLISHED_IN", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK.LANGUAGE_ID. - */ - public final TableField LANGUAGE_ID = createField("LANGUAGE_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * Create a PUBLIC.BOOK table reference - */ - public Book() { - this("BOOK", null); - } - - /** - * Create an aliased PUBLIC.BOOK table reference - */ - public Book(String alias) { - this(alias, BOOK); - } - - private Book(String alias, Table aliased) { - this(alias, aliased, null); - } - - private Book(String alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Public.PUBLIC; - } - - /** - * {@inheritDoc} - */ - @Override - public UniqueKey getPrimaryKey() { - return Keys.CONSTRAINT_1; - } - - /** - * {@inheritDoc} - */ - @Override - public List> getKeys() { - return Arrays.>asList(Keys.CONSTRAINT_1); - } - - /** - * {@inheritDoc} - */ - @Override - public List> getReferences() { - return Arrays.>asList(Keys.FK_BOOK_AUTHOR, Keys.FK_BOOK_LANGUAGE); - } - - /** - * {@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); - } + private static final long serialVersionUID = 1176189796; + + /** + * The reference instance of PUBLIC.BOOK + */ + public static final Book BOOK = new Book(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return Record.class; + } + + /** + * The column PUBLIC.BOOK.ID. + */ + public final TableField ID = createField("ID", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column PUBLIC.BOOK.AUTHOR_ID. + */ + public final TableField AUTHOR_ID = createField("AUTHOR_ID", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column PUBLIC.BOOK.TITLE. + */ + public final TableField TITLE = createField("TITLE", + org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); + + /** + * The column PUBLIC.BOOK.PUBLISHED_IN. + */ + public final TableField PUBLISHED_IN = createField("PUBLISHED_IN", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column PUBLIC.BOOK.LANGUAGE_ID. + */ + public final TableField LANGUAGE_ID = createField("LANGUAGE_ID", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * Create a PUBLIC.BOOK table reference + */ + public Book() { + this("BOOK", null); + } + + /** + * Create an aliased PUBLIC.BOOK table reference + */ + public Book(String alias) { + this(alias, BOOK); + } + + private Book(String alias, Table aliased) { + this(alias, aliased, null); + } + + private Book(String alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return Public.PUBLIC; + } + + /** + * {@inheritDoc} + */ + @Override + public UniqueKey getPrimaryKey() { + return Keys.CONSTRAINT_1; + } + + /** + * {@inheritDoc} + */ + @Override + public List> getKeys() { + return Arrays.>asList(Keys.CONSTRAINT_1); + } + + /** + * {@inheritDoc} + */ + @Override + public List> getReferences() { + return Arrays.>asList(Keys.FK_BOOK_AUTHOR, + Keys.FK_BOOK_LANGUAGE); + } + + /** + * {@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); + } } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java index 2a9ec44f91..a4025863c5 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java @@ -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 { - private static final long serialVersionUID = -2132596210; - - /** - * The reference instance of PUBLIC.BOOK_STORE - */ - public static final BookStore BOOK_STORE = new BookStore(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return Record.class; - } - - /** - * The column PUBLIC.BOOK_STORE.NAME. - */ - public final TableField NAME = createField("NAME", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); - - /** - * Create a PUBLIC.BOOK_STORE table reference - */ - public BookStore() { - this("BOOK_STORE", null); - } - - /** - * Create an aliased PUBLIC.BOOK_STORE table reference - */ - public BookStore(String alias) { - this(alias, BOOK_STORE); - } - - private BookStore(String alias, Table aliased) { - this(alias, aliased, null); - } - - private BookStore(String alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Public.PUBLIC; - } - - /** - * {@inheritDoc} - */ - @Override - public List> getKeys() { - return Arrays.>asList(Keys.CONSTRAINT_F); - } - - /** - * {@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); - } + private static final long serialVersionUID = -2132596210; + + /** + * The reference instance of PUBLIC.BOOK_STORE + */ + public static final BookStore BOOK_STORE = new BookStore(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return Record.class; + } + + /** + * The column PUBLIC.BOOK_STORE.NAME. + */ + public final TableField NAME = createField("NAME", + org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); + + /** + * Create a PUBLIC.BOOK_STORE table reference + */ + public BookStore() { + this("BOOK_STORE", null); + } + + /** + * Create an aliased PUBLIC.BOOK_STORE table reference + */ + public BookStore(String alias) { + this(alias, BOOK_STORE); + } + + private BookStore(String alias, Table aliased) { + this(alias, aliased, null); + } + + private BookStore(String alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return Public.PUBLIC; + } + + /** + * {@inheritDoc} + */ + @Override + public List> getKeys() { + return Arrays.>asList(Keys.CONSTRAINT_F); + } + + /** + * {@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); + } } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java index 14d7670efa..fa5ea67190 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java @@ -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 { - private static final long serialVersionUID = -1360744633; - - /** - * The reference instance of PUBLIC.BOOK_TO_BOOK_STORE - */ - public static final BookToBookStore BOOK_TO_BOOK_STORE = new BookToBookStore(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return Record.class; - } - - /** - * The column PUBLIC.BOOK_TO_BOOK_STORE.NAME. - */ - public final TableField NAME = createField("NAME", org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK_TO_BOOK_STORE.BOOK_ID. - */ - public final TableField BOOK_ID = createField("BOOK_ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.BOOK_TO_BOOK_STORE.STOCK. - */ - public final TableField STOCK = createField("STOCK", org.jooq.impl.SQLDataType.INTEGER, this, ""); - - /** - * Create a PUBLIC.BOOK_TO_BOOK_STORE table reference - */ - public BookToBookStore() { - this("BOOK_TO_BOOK_STORE", null); - } - - /** - * Create an aliased PUBLIC.BOOK_TO_BOOK_STORE table reference - */ - public BookToBookStore(String alias) { - this(alias, BOOK_TO_BOOK_STORE); - } - - private BookToBookStore(String alias, Table aliased) { - this(alias, aliased, null); - } - - private BookToBookStore(String alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Public.PUBLIC; - } - - /** - * {@inheritDoc} - */ - @Override - public UniqueKey getPrimaryKey() { - return Keys.CONSTRAINT_2; - } - - /** - * {@inheritDoc} - */ - @Override - public List> getKeys() { - return Arrays.>asList(Keys.CONSTRAINT_2); - } - - /** - * {@inheritDoc} - */ - @Override - public List> getReferences() { - return Arrays.>asList(Keys.FK_B2BS_BOOK_STORE, Keys.FK_B2BS_BOOK); - } - - /** - * {@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); - } + private static final long serialVersionUID = -1360744633; + + /** + * The reference instance of PUBLIC.BOOK_TO_BOOK_STORE + */ + public static final BookToBookStore BOOK_TO_BOOK_STORE = new BookToBookStore(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return Record.class; + } + + /** + * The column PUBLIC.BOOK_TO_BOOK_STORE.NAME. + */ + public final TableField NAME = createField("NAME", + org.jooq.impl.SQLDataType.VARCHAR.length(400).nullable(false), this, ""); + + /** + * The column PUBLIC.BOOK_TO_BOOK_STORE.BOOK_ID. + */ + public final TableField BOOK_ID = createField("BOOK_ID", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column PUBLIC.BOOK_TO_BOOK_STORE.STOCK. + */ + public final TableField STOCK = createField("STOCK", + org.jooq.impl.SQLDataType.INTEGER, this, ""); + + /** + * Create a PUBLIC.BOOK_TO_BOOK_STORE table reference + */ + public BookToBookStore() { + this("BOOK_TO_BOOK_STORE", null); + } + + /** + * Create an aliased PUBLIC.BOOK_TO_BOOK_STORE table reference + */ + public BookToBookStore(String alias) { + this(alias, BOOK_TO_BOOK_STORE); + } + + private BookToBookStore(String alias, Table aliased) { + this(alias, aliased, null); + } + + private BookToBookStore(String alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return Public.PUBLIC; + } + + /** + * {@inheritDoc} + */ + @Override + public UniqueKey getPrimaryKey() { + return Keys.CONSTRAINT_2; + } + + /** + * {@inheritDoc} + */ + @Override + public List> getKeys() { + return Arrays.>asList(Keys.CONSTRAINT_2); + } + + /** + * {@inheritDoc} + */ + @Override + public List> getReferences() { + return Arrays.>asList(Keys.FK_B2BS_BOOK_STORE, + Keys.FK_B2BS_BOOK); + } + + /** + * {@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); + } } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/DefaultCatalog.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/DefaultCatalog.java index ad694671be..8d7d9f5aba 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/DefaultCatalog.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/DefaultCatalog.java @@ -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; - - /** - * The reference instance of - */ - public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog(); - - /** - * The schema PUBLIC. - */ - public final Public PUBLIC = sample.jooq.domain.Public.PUBLIC; - - /** - * No further instances allowed - */ - private DefaultCatalog() { - super(""); - } - - @Override - public final List getSchemas() { - List result = new ArrayList(); - result.addAll(getSchemas0()); - return result; - } - - private final List getSchemas0() { - return Arrays.asList( - Public.PUBLIC); - } + private static final long serialVersionUID = -1557925562; + + /** + * The reference instance of + */ + public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog(); + + /** + * The schema PUBLIC. + */ + public final Public PUBLIC = sample.jooq.domain.Public.PUBLIC; + + /** + * No further instances allowed + */ + private DefaultCatalog() { + super(""); + } + + @Override + public final List getSchemas() { + List result = new ArrayList(); + result.addAll(getSchemas0()); + return result; + } + + private final List getSchemas0() { + return Arrays.asList(Public.PUBLIC); + } } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java index 40c31d9b1b..c31be48346 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Keys.java @@ -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 PUBLIC + * A class modelling foreign key relationships between tables of the PUBLIC * 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 CONSTRAINT_C = UniqueKeys0.CONSTRAINT_C; - public static final UniqueKey CONSTRAINT_7 = UniqueKeys0.CONSTRAINT_7; - public static final UniqueKey CONSTRAINT_1 = UniqueKeys0.CONSTRAINT_1; - public static final UniqueKey CONSTRAINT_F = UniqueKeys0.CONSTRAINT_F; - public static final UniqueKey CONSTRAINT_2 = UniqueKeys0.CONSTRAINT_2; + public static final UniqueKey CONSTRAINT_C = UniqueKeys0.CONSTRAINT_C; + public static final UniqueKey CONSTRAINT_7 = UniqueKeys0.CONSTRAINT_7; + public static final UniqueKey CONSTRAINT_1 = UniqueKeys0.CONSTRAINT_1; + public static final UniqueKey CONSTRAINT_F = UniqueKeys0.CONSTRAINT_F; + public static final UniqueKey CONSTRAINT_2 = UniqueKeys0.CONSTRAINT_2; - // ------------------------------------------------------------------------- - // FOREIGN KEY definitions - // ------------------------------------------------------------------------- + // ------------------------------------------------------------------------- + // FOREIGN KEY definitions + // ------------------------------------------------------------------------- - public static final ForeignKey FK_BOOK_AUTHOR = ForeignKeys0.FK_BOOK_AUTHOR; - public static final ForeignKey FK_BOOK_LANGUAGE = ForeignKeys0.FK_BOOK_LANGUAGE; - public static final ForeignKey FK_B2BS_BOOK_STORE = ForeignKeys0.FK_B2BS_BOOK_STORE; - public static final ForeignKey FK_B2BS_BOOK = ForeignKeys0.FK_B2BS_BOOK; + public static final ForeignKey FK_BOOK_AUTHOR = ForeignKeys0.FK_BOOK_AUTHOR; + public static final ForeignKey FK_BOOK_LANGUAGE = ForeignKeys0.FK_BOOK_LANGUAGE; + public static final ForeignKey FK_B2BS_BOOK_STORE = ForeignKeys0.FK_B2BS_BOOK_STORE; + public static final ForeignKey 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 CONSTRAINT_C = createUniqueKey(Language.LANGUAGE, "CONSTRAINT_C", Language.LANGUAGE.ID); - public static final UniqueKey CONSTRAINT_7 = createUniqueKey(Author.AUTHOR, "CONSTRAINT_7", Author.AUTHOR.ID); - public static final UniqueKey CONSTRAINT_1 = createUniqueKey(Book.BOOK, "CONSTRAINT_1", Book.BOOK.ID); - public static final UniqueKey CONSTRAINT_F = createUniqueKey(BookStore.BOOK_STORE, "CONSTRAINT_F", BookStore.BOOK_STORE.NAME); - public static final UniqueKey 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 CONSTRAINT_C = createUniqueKey( + Language.LANGUAGE, "CONSTRAINT_C", Language.LANGUAGE.ID); + public static final UniqueKey CONSTRAINT_7 = createUniqueKey( + Author.AUTHOR, "CONSTRAINT_7", Author.AUTHOR.ID); + public static final UniqueKey CONSTRAINT_1 = createUniqueKey(Book.BOOK, + "CONSTRAINT_1", Book.BOOK.ID); + public static final UniqueKey CONSTRAINT_F = createUniqueKey( + BookStore.BOOK_STORE, "CONSTRAINT_F", BookStore.BOOK_STORE.NAME); + public static final UniqueKey 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 FK_BOOK_AUTHOR = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_7, Book.BOOK, "FK_BOOK_AUTHOR", Book.BOOK.AUTHOR_ID); - public static final ForeignKey FK_BOOK_LANGUAGE = createForeignKey(sample.jooq.domain.Keys.CONSTRAINT_C, Book.BOOK, "FK_BOOK_LANGUAGE", Book.BOOK.LANGUAGE_ID); - public static final ForeignKey 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 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 FK_BOOK_AUTHOR = createForeignKey( + sample.jooq.domain.Keys.CONSTRAINT_7, Book.BOOK, "FK_BOOK_AUTHOR", + Book.BOOK.AUTHOR_ID); + public static final ForeignKey FK_BOOK_LANGUAGE = createForeignKey( + sample.jooq.domain.Keys.CONSTRAINT_C, Book.BOOK, "FK_BOOK_LANGUAGE", + Book.BOOK.LANGUAGE_ID); + public static final ForeignKey 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 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); + } } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java index d428bab66e..a8f9d51578 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java @@ -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 { - private static final long serialVersionUID = -1890716744; - - /** - * The reference instance of PUBLIC.LANGUAGE - */ - public static final Language LANGUAGE = new Language(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return Record.class; - } - - /** - * The column PUBLIC.LANGUAGE.ID. - */ - public final TableField ID = createField("ID", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column PUBLIC.LANGUAGE.CD. - */ - public final TableField CD = createField("CD", org.jooq.impl.SQLDataType.CHAR.length(2).nullable(false), this, ""); - - /** - * The column PUBLIC.LANGUAGE.DESCRIPTION. - */ - public final TableField DESCRIPTION = createField("DESCRIPTION", org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); - - /** - * Create a PUBLIC.LANGUAGE table reference - */ - public Language() { - this("LANGUAGE", null); - } - - /** - * Create an aliased PUBLIC.LANGUAGE table reference - */ - public Language(String alias) { - this(alias, LANGUAGE); - } - - private Language(String alias, Table aliased) { - this(alias, aliased, null); - } - - private Language(String alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, ""); - } - - /** - * {@inheritDoc} - */ - @Override - public Schema getSchema() { - return Public.PUBLIC; - } - - /** - * {@inheritDoc} - */ - @Override - public UniqueKey getPrimaryKey() { - return Keys.CONSTRAINT_C; - } - - /** - * {@inheritDoc} - */ - @Override - public List> getKeys() { - return Arrays.>asList(Keys.CONSTRAINT_C); - } - - /** - * {@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); - } + private static final long serialVersionUID = -1890716744; + + /** + * The reference instance of PUBLIC.LANGUAGE + */ + public static final Language LANGUAGE = new Language(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return Record.class; + } + + /** + * The column PUBLIC.LANGUAGE.ID. + */ + public final TableField ID = createField("ID", + org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column PUBLIC.LANGUAGE.CD. + */ + public final TableField CD = createField("CD", + org.jooq.impl.SQLDataType.CHAR.length(2).nullable(false), this, ""); + + /** + * The column PUBLIC.LANGUAGE.DESCRIPTION. + */ + public final TableField DESCRIPTION = createField("DESCRIPTION", + org.jooq.impl.SQLDataType.VARCHAR.length(50), this, ""); + + /** + * Create a PUBLIC.LANGUAGE table reference + */ + public Language() { + this("LANGUAGE", null); + } + + /** + * Create an aliased PUBLIC.LANGUAGE table reference + */ + public Language(String alias) { + this(alias, LANGUAGE); + } + + private Language(String alias, Table aliased) { + this(alias, aliased, null); + } + + private Language(String alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, ""); + } + + /** + * {@inheritDoc} + */ + @Override + public Schema getSchema() { + return Public.PUBLIC; + } + + /** + * {@inheritDoc} + */ + @Override + public UniqueKey getPrimaryKey() { + return Keys.CONSTRAINT_C; + } + + /** + * {@inheritDoc} + */ + @Override + public List> getKeys() { + return Arrays.>asList(Keys.CONSTRAINT_C); + } + + /** + * {@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); + } } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java index 2a62940b2c..518929650f 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Public.java @@ -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; - - /** - * The reference instance of PUBLIC - */ - public static final Public PUBLIC = new Public(); - - /** - * The table PUBLIC.LANGUAGE. - */ - public final Language LANGUAGE = sample.jooq.domain.Language.LANGUAGE; - - /** - * The table PUBLIC.AUTHOR. - */ - public final Author AUTHOR = sample.jooq.domain.Author.AUTHOR; - - /** - * The table PUBLIC.BOOK. - */ - public final Book BOOK = sample.jooq.domain.Book.BOOK; - - /** - * The table PUBLIC.BOOK_STORE. - */ - public final BookStore BOOK_STORE = sample.jooq.domain.BookStore.BOOK_STORE; - - /** - * The table PUBLIC.BOOK_TO_BOOK_STORE. - */ - public final BookToBookStore BOOK_TO_BOOK_STORE = sample.jooq.domain.BookToBookStore.BOOK_TO_BOOK_STORE; - - /** - * No further instances allowed - */ - private Public() { - super("PUBLIC", null); - } - - - /** - * {@inheritDoc} - */ - @Override - public Catalog getCatalog() { - return DefaultCatalog.DEFAULT_CATALOG; - } - - @Override - public final List> getTables() { - List result = new ArrayList(); - result.addAll(getTables0()); - return result; - } - - private final List> getTables0() { - return Arrays.>asList( - Language.LANGUAGE, - Author.AUTHOR, - Book.BOOK, - BookStore.BOOK_STORE, - BookToBookStore.BOOK_TO_BOOK_STORE); - } + private static final long serialVersionUID = 217498103; + + /** + * The reference instance of PUBLIC + */ + public static final Public PUBLIC = new Public(); + + /** + * The table PUBLIC.LANGUAGE. + */ + public final Language LANGUAGE = sample.jooq.domain.Language.LANGUAGE; + + /** + * The table PUBLIC.AUTHOR. + */ + public final Author AUTHOR = sample.jooq.domain.Author.AUTHOR; + + /** + * The table PUBLIC.BOOK. + */ + public final Book BOOK = sample.jooq.domain.Book.BOOK; + + /** + * The table PUBLIC.BOOK_STORE. + */ + public final BookStore BOOK_STORE = sample.jooq.domain.BookStore.BOOK_STORE; + + /** + * The table PUBLIC.BOOK_TO_BOOK_STORE. + */ + public final BookToBookStore BOOK_TO_BOOK_STORE = sample.jooq.domain.BookToBookStore.BOOK_TO_BOOK_STORE; + + /** + * No further instances allowed + */ + private Public() { + super("PUBLIC", null); + } + + /** + * {@inheritDoc} + */ + @Override + public Catalog getCatalog() { + return DefaultCatalog.DEFAULT_CATALOG; + } + + @Override + public final List> getTables() { + List result = new ArrayList(); + result.addAll(getTables0()); + return result; + } + + private final List> getTables0() { + return Arrays.>asList(Language.LANGUAGE, Author.AUTHOR, Book.BOOK, + BookStore.BOOK_STORE, BookToBookStore.BOOK_TO_BOOK_STORE); + } } diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java index cda1ec3a6f..b31f88e74f 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java +++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Tables.java @@ -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 PUBLIC.LANGUAGE. - */ - public static final Language LANGUAGE = sample.jooq.domain.Language.LANGUAGE; - - /** - * The table PUBLIC.AUTHOR. - */ - public static final Author AUTHOR = sample.jooq.domain.Author.AUTHOR; - - /** - * The table PUBLIC.BOOK. - */ - public static final Book BOOK = sample.jooq.domain.Book.BOOK; - - /** - * The table PUBLIC.BOOK_STORE. - */ - public static final BookStore BOOK_STORE = sample.jooq.domain.BookStore.BOOK_STORE; - - /** - * The table PUBLIC.BOOK_TO_BOOK_STORE. - */ - public static final BookToBookStore BOOK_TO_BOOK_STORE = sample.jooq.domain.BookToBookStore.BOOK_TO_BOOK_STORE; + /** + * The table PUBLIC.LANGUAGE. + */ + public static final Language LANGUAGE = sample.jooq.domain.Language.LANGUAGE; + + /** + * The table PUBLIC.AUTHOR. + */ + public static final Author AUTHOR = sample.jooq.domain.Author.AUTHOR; + + /** + * The table PUBLIC.BOOK. + */ + public static final Book BOOK = sample.jooq.domain.Book.BOOK; + + /** + * The table PUBLIC.BOOK_STORE. + */ + public static final BookStore BOOK_STORE = sample.jooq.domain.BookStore.BOOK_STORE; + + /** + * The table PUBLIC.BOOK_TO_BOOK_STORE. + */ + public static final BookToBookStore BOOK_TO_BOOK_STORE = sample.jooq.domain.BookToBookStore.BOOK_TO_BOOK_STORE; } diff --git a/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java b/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java index a5b6c50081..cdb339f609 100644 --- a/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java @@ -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 diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java index 1bca18686c..d8a9e33b94 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java @@ -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 */ diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java index e94d012156..f8bcaf0242 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java @@ -226,8 +226,7 @@ public class PropertiesConfigurationFactory } 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 customizeBinder(dataBinder); Iterable relaxedTargetNames = getRelaxedTargetNames(); Set names = getNames(relaxedTargetNames); - PropertyValues propertyValues = getPropertySourcesPropertyValues(names, relaxedTargetNames); + PropertyValues propertyValues = getPropertySourcesPropertyValues(names, + relaxedTargetNames); dataBinder.bind(propertyValues); if (this.validator != null) { validate(dataBinder);