diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
index 1c6d43719..7fffd8c3b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -228,10 +228,9 @@ public final class BindParams implements Serializable {
/**
* Set a named In parameter that is multi-valued.
*/
- public Param setArrayParameter(String name, Collection> value) {
+ public void setArrayParameter(String name, Collection> value) {
Param p = getParam(name);
p.setInValue(new MultiValueWrapper(value));
- return p;
}
/**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
index da38b3856..d0bc7bcef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
@@ -93,7 +93,7 @@ public final class ScopeTrans {
/**
* Return the current/active transaction.
*/
- protected SpiTransaction getTransaction() {
+ SpiTransaction getTransaction() {
return transaction;
}
@@ -124,7 +124,7 @@ public final class ScopeTrans {
}
}
- protected void commitTransaction() {
+ void commitTransaction() {
if (created) {
transaction.commit();
} else {
@@ -175,7 +175,7 @@ public final class ScopeTrans {
return e;
}
- protected void rollback(Throwable e) {
+ void rollback(Throwable e) {
if (transaction != null && transaction.isActive()) {
// transaction is null for NOT_SUPPORTED and sometimes SUPPORTS
// and Inactive (already rolled back) if nested REQUIRED
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index 323a9b7da..10fa49a13 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -7,7 +7,7 @@ import javax.persistence.PersistenceException;
/**
* Manage scoped (typically thread local) transactions.
- *
+ *
* These can be nested and internally they are pushed and popped from a stack.
*/
public final class ScopedTransaction extends SpiTransactionProxy {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
index 8fe986259..e4392bf17 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
@@ -13,8 +13,8 @@ import java.io.IOException;
*/
public interface SpiExpression extends Expression {
- static final String SQL_TRUE = "1=1";
- static final String SQL_FALSE = "1=0";
+ String SQL_TRUE = "1=1";
+ String SQL_FALSE = "1=0";
/**
* Simplify nested expressions if possible.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java
index c2c6194cd..2c06dbb81 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java
@@ -139,7 +139,7 @@ public final class TransactionEvent implements Serializable {
/**
* Return the CacheChangeSet that we add cache notification messages to.
- *
+ *
* We want to add to this change set as we process requests allowing the
* PersistRequestBean to be garbage collected for large transactions.
*/
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java b/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java
index 8c492d77b..f2339cbc9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.api;
/**
* Event codes used in transaction profiling.
- *
+ *
* These appear in verbose transaction profile logs.
*/
public interface TxnProfileEventCodes {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
index 73ad97f2c..c13a7d6db 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
@@ -100,11 +100,7 @@ final class DumpMetrics {
}
private void logCount(MetaCountMetric metric) {
-
- StringBuilder sb = new StringBuilder();
- sb.append(padNameTimed(metric.name())).append(" ");
- sb.append(" count:").append(pad(metric.count()));
- out(sb.toString());
+ out(padNameTimed(metric.name()) + " count:" + pad(metric.count()));
}
private void out(String sb) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index 63f31434a..e2f898e3c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -49,9 +49,9 @@ public final class PersistRequestUpdateSql extends PersistRequest {
/**
* Add this statement to JDBC batch for later execution.
*/
- public int addBatch() {
+ public void addBatch() {
this.addBatch = true;
- return executeStatement(true);
+ executeStatement(true);
}
/**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
index c3f98854b..039158200 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
@@ -138,7 +138,7 @@ public interface SpiOrmQueryRequest extends BeanQueryRequest, DocQueryRequ
/**
* Maybe hit the bean cache returning true if everything was obtained from the
* cache (that there were no misses).
- *
+ *
* Do this for findList() on many natural keys or many Ids.
*/
boolean getFromBeanCache();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
index e95c0d461..ed114375b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
@@ -5,7 +5,7 @@ import java.sql.ResultSet;
/**
* Hold the JDBC PreparedStatement and ResultSet.
- *
+ *
* These both must be closed properly when done.
*/
public final class SpiResultSet {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
index 456b90987..e794740e5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
@@ -55,7 +55,7 @@ class ManifestReader {
/**
* Read all the specific manifest files and return the set of packages containing type query beans.
*/
- private Set read(ClassLoader classLoader, String resourcePath) {
+ private void read(ClassLoader classLoader, String resourcePath) {
try {
Enumeration resources = classLoader.getResources(resourcePath);
while (resources.hasMoreElements()) {
@@ -66,7 +66,6 @@ class ManifestReader {
} catch (IOException e) {
log.log(WARNING, "Error reading " + resourcePath + " manifest resources", e);
}
- return packageSet;
}
/**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 5a3b1236b..eddf39e5d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -3157,18 +3157,17 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType {
/**
* Return true if any mutable properties are dirty.
*/
- public boolean checkAnyMutableProperties(EntityBeanIntercept ebi) {
+ public void checkAnyMutableProperties(EntityBeanIntercept ebi) {
for (BeanProperty beanProperty : propertiesMutable) {
int propertyIndex = beanProperty.propertyIndex();
if (ebi.isLoadedProperty(propertyIndex)) {
Object value = beanProperty.getValue(ebi.getOwner());
if (beanProperty.checkMutable(value, ebi.isDirtyProperty(propertyIndex), ebi)) {
ebi.markPropertyAsChanged(propertyIndex);
- return true;
+ return;
}
}
}
- return false;
}
public ConcurrencyMode concurrencyMode(EntityBeanIntercept ebi) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 015fcbe70..eba2da8ee 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -706,9 +706,7 @@ final class BeanDescriptorCacheHelp {
}
Set loaded = new HashSet<>();
- Iterator> iterator = hits.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry