diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElComparator.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElComparator.java index ead232da8..f27779bd8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElComparator.java +++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElComparator.java @@ -10,11 +10,11 @@ public interface ElComparator extends Comparator { /** * Compare given 2 beans. */ - public int compare(T o1, T o2); + int compare(T o1, T o2); /** * Compare with a fixed value to a given bean. */ - public int compareValue(Object value, T o2); + int compareValue(Object value, T o2); } \ No newline at end of file diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElMatcher.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElMatcher.java index 06858c61c..2c6ebc8ac 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElMatcher.java +++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElMatcher.java @@ -8,5 +8,5 @@ public interface ElMatcher { /** * Return true if the bean matches the expression. */ - public boolean isMatch(T bean); + boolean isMatch(T bean); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyDeploy.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyDeploy.java index 128346f45..4bf5caea4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyDeploy.java +++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyDeploy.java @@ -5,69 +5,68 @@ import com.avaje.ebeaninternal.server.deploy.BeanProperty; /** * Used to parse expressions in queries (where, orderBy etc). *

- * Maps an expression to deployment information such as + * Maps an expression to deployment information such as * the DB column and elPrefix/elPlaceHolder is used determine * joins and set place holders for table alias'. *

*/ public interface ElPropertyDeploy { - /** - * This is the elPrefix for all root level properties. - */ - public static final String ROOT_ELPREFIX = "${}"; + /** + * This is the elPrefix for all root level properties. + */ + String ROOT_ELPREFIX = "${}"; - /** - * Return true if the property is a formula with a join clause. - */ - public boolean containsFormulaWithJoin(); + /** + * Return true if the property is a formula with a join clause. + */ + boolean containsFormulaWithJoin(); - /** - * Return true if there is a property on the path that is a many property. - */ - public boolean containsMany(); + /** + * Return true if there is a property on the path that is a many property. + */ + boolean containsMany(); - /** - * Return true if there is a property is on the path after sinceProperty - * that is a 'many' property. - */ - public boolean containsManySince(String sinceProperty); + /** + * Return true if there is a property is on the path after sinceProperty + * that is a 'many' property. + */ + boolean containsManySince(String sinceProperty); - /** - * Return the prefix path of the property. - *

- * This is use to determine joins required to support - * this property. - *

- */ - public String getElPrefix(); + /** + * Return the prefix path of the property. + *

+ * This is use to determine joins required to support + * this property. + *

+ */ + String getElPrefix(); - /** - * Return the place holder in the form of ${elPrefix}dbColumn. - *

- * The ${elPrefix} is replaced by the appropriate table alias. - *

- */ - public String getElPlaceholder(boolean encrypted); - - /** - * Return the name of the property. - */ - public String getName(); + /** + * Return the place holder in the form of ${elPrefix}dbColumn. + *

+ * The ${elPrefix} is replaced by the appropriate table alias. + *

+ */ + String getElPlaceholder(boolean encrypted); - /** - * The ElPrefix plus name. - */ - public String getElName(); + /** + * Return the name of the property. + */ + String getName(); - /** - * Return the deployment db column for this property. - */ - public String getDbColumn(); - + /** + * The ElPrefix plus name. + */ + String getElName(); - /** - * Return the underlying bean property. - */ - public BeanProperty getBeanProperty(); + /** + * Return the deployment db column for this property. + */ + String getDbColumn(); + + /** + * Return the underlying bean property. + */ + BeanProperty getBeanProperty(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourceAlert.java b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourceAlert.java index e6626b1e3..284ea06fd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourceAlert.java +++ b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourceAlert.java @@ -13,15 +13,15 @@ public interface DataSourceAlert { /** * Send an alert to say the dataSource is back up. */ - public void dataSourceUp(String dataSourceName); + void dataSourceUp(String dataSourceName); /** * Send an alert to say the dataSource is down. */ - public void dataSourceDown(String dataSourceName); + void dataSourceDown(String dataSourceName); /** * Send an alert to say the dataSource is getting close to its max size. */ - public void dataSourceWarning(String subject, String msg); + void dataSourceWarning(String subject, String msg); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePoolListener.java b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePoolListener.java index 0ae328fc5..d17b147f6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePoolListener.java +++ b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePoolListener.java @@ -24,11 +24,11 @@ public interface DataSourcePoolListener { /** * Called after a connection has been retrieved from the connection pool */ - public void onAfterBorrowConnection(Connection c); + void onAfterBorrowConnection(Connection c); /** * Called before a connection will be put back to the connection pool */ - public void onBeforeReturnConnection(Connection c); + void onBeforeReturnConnection(Connection c); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadList.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadList.java index 077db14ca..b88dff6dd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadList.java @@ -4,18 +4,18 @@ import java.util.List; public interface DLoadList { - public int add(T e); + int add(T e); /** * Return the next batch of entries from the top. */ - public abstract List getNextBatch(int batchSize); + List getNextBatch(int batchSize); - public void removeEntry(int position); + void removeEntry(int position); /** * Return the batch of entries based on the position and batch size. */ - public List getLoadBatch(int position, int batchSize); + List getLoadBatch(int position, int batchSize); } \ No newline at end of file diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/Constant.java b/src/main/java/com/avaje/ebeaninternal/server/persist/Constant.java index 3a316cbf2..944bd6e4c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/Constant.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/Constant.java @@ -8,20 +8,20 @@ public interface Constant { /** * An INSERT clause. */ - public static final int IN_INSERT = 1; + static final int IN_INSERT = 1; /** * An UPDATE SET clause. */ - public static final int IN_UPDATE_SET = 2; + static final int IN_UPDATE_SET = 2; /** * An UPDATE WHERE clause. */ - public static final int IN_UPDATE_WHERE = 3; + static final int IN_UPDATE_WHERE = 3; /** * A DELETE WHERE clause. */ - public static final int IN_DELETE_WHERE = 4; + static final int IN_DELETE_WHERE = 4; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/Constants.java b/src/main/java/com/avaje/ebeaninternal/server/query/Constants.java index 6f3aa5497..ad743da59 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/Constants.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/Constants.java @@ -8,20 +8,20 @@ public interface Constants { /** * literal used for SQL LIMIT in MySql and Postgres. */ - public static final String LIMIT = "limit"; + static final String LIMIT = "limit"; /** * Literal used for SQL LIMIT OFFSET clause in MySql and Postgres. */ - public static final String OFFSET = "offset"; + static final String OFFSET = "offset"; /** * ROW_NUMBER() OVER (ORDER BY */ - public static final String ROW_NUMBER_OVER = "row_number() over (order by "; + static final String ROW_NUMBER_OVER = "row_number() over (order by "; /** * ) as rn, */ - public static final String ROW_NUMBER_AS = ") as rn, "; + static final String ROW_NUMBER_AS = ") as rn, "; }