From 6843c7214905bc58ddf4cd263409881dfd68c78e Mon Sep 17 00:00:00 2001
From: Robin Bygrave
Date: Fri, 31 Jul 2015 13:16:36 +1200
Subject: [PATCH] No effective change - Code cleanup,remove unnecessary public
modifier on interfaces
---
.../ebean/config/dbplatform/IdGenerator.java | 2 +-
.../ebean/config/dbplatform/SqlLimiter.java | 4 +-
.../server/cluster/PacketWriter.java | 2 +-
.../server/cluster/mcast/Message.java | 6 +--
.../ebeaninternal/server/core/Persister.java | 26 ++++++------
.../ebeaninternal/server/core/PstmtBatch.java | 6 +--
.../server/core/RelationalQueryEngine.java | 2 +-
.../server/ddl/PropertyVisitor.java | 16 ++++----
.../server/deploy/InheritInfoVisitor.java | 2 +-
.../generatedproperty/GeneratedProperty.java | 12 +++---
.../server/deploy/id/ImportedId.java | 20 +++++-----
.../server/el/ElPropertyValue.java | 36 ++++++++---------
.../ebeaninternal/server/el/ElSetValue.java | 2 +-
.../server/jmx/MAdminAutofetchMBean.java | 40 +++++++++----------
.../server/lib/resource/ResourceContent.java | 8 ++--
.../server/lib/resource/ResourceSource.java | 8 ++--
.../server/lib/util/MailListener.java | 2 +-
.../server/persist/PersistExecute.java | 14 +++----
.../server/persist/dml/PersistHandler.java | 10 ++---
.../server/type/reflect/KnownImmutable.java | 2 +-
20 files changed, 110 insertions(+), 110 deletions(-)
diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/IdGenerator.java b/src/main/java/com/avaje/ebean/config/dbplatform/IdGenerator.java
index d7656a820..d8d2171d5 100644
--- a/src/main/java/com/avaje/ebean/config/dbplatform/IdGenerator.java
+++ b/src/main/java/com/avaje/ebean/config/dbplatform/IdGenerator.java
@@ -16,7 +16,7 @@ public interface IdGenerator {
/**
* The name of the default UUID generator.
*/
- static final String AUTO_UUID = "auto.uuid";
+ String AUTO_UUID = "auto.uuid";
/**
* Return the name of the IdGenerator. For sequences this is the sequence
diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimiter.java b/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimiter.java
index 16faeada7..22831b4ae 100644
--- a/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimiter.java
+++ b/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimiter.java
@@ -11,12 +11,12 @@ public interface SqlLimiter {
* Note that this is removed for logging sql to the transaction log.
*
*/
- static final char NEW_LINE = '\n';
+ char NEW_LINE = '\n';
/**
* The carriage return character.
*/
- static final char CARRIAGE_RETURN = '\r';
+ char CARRIAGE_RETURN = '\r';
/**
* Add the SQL limiting statements around the query.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/PacketWriter.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/PacketWriter.java
index 853ec3bc6..3d92314fa 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/PacketWriter.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/PacketWriter.java
@@ -94,7 +94,7 @@ public class PacketWriter {
interface PacketFactory {
- public Packet createPacket(long packetId, long timestamp, String serverName) throws IOException;
+ Packet createPacket(long packetId, long timestamp, String serverName) throws IOException;
}
private static class TransPacketFactory implements PacketFactory {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/Message.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/Message.java
index 42718418e..230c75fff 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/Message.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/mcast/Message.java
@@ -6,9 +6,9 @@ import com.avaje.ebeaninternal.server.cluster.BinaryMessageList;
public interface Message {
- public void writeBinaryMessage(BinaryMessageList msgList) throws IOException;
+ void writeBinaryMessage(BinaryMessageList msgList) throws IOException;
- public boolean isControlMessage();
+ boolean isControlMessage();
- public String getToHostPort();
+ String getToHostPort();
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/Persister.java b/src/main/java/com/avaje/ebeaninternal/server/core/Persister.java
index 42ffa586d..a666f5d93 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/Persister.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/Persister.java
@@ -17,28 +17,28 @@ public interface Persister {
/**
* Update the bean.
*/
- public void update(EntityBean entityBean, Transaction t);
+ void update(EntityBean entityBean, Transaction t);
/**
* Update the bean specifying deleteMissingChildren.
*/
- public void update(EntityBean entityBean, Transaction t, boolean deleteMissingChildren);
+ void update(EntityBean entityBean, Transaction t, boolean deleteMissingChildren);
/**
* Force an Insert using the given bean.
*/
- public void insert(EntityBean entityBean, Transaction t);
+ void insert(EntityBean entityBean, Transaction t);
/**
* Insert or update the bean depending on its state.
*/
- public void save(EntityBean entityBean, Transaction t);
+ void save(EntityBean entityBean, Transaction t);
/**
* Save the associations of a ManyToMany given the owner bean and the
* propertyName of the ManyToMany collection.
*/
- public void saveManyToManyAssociations(EntityBean ownerBean, String propertyName, Transaction t);
+ void saveManyToManyAssociations(EntityBean ownerBean, String propertyName, Transaction t);
/**
* Save an association (OneToMany, ManyToOne, OneToOne or ManyToMany).
@@ -50,12 +50,12 @@ public interface Persister {
* @param t
* the transaction to use.
*/
- public void saveAssociation(EntityBean parentBean, String propertyName, Transaction t);
+ void saveAssociation(EntityBean parentBean, String propertyName, Transaction t);
/**
* Delete the associations of a ManyToMany given the owner bean and the property name of the ManyToMany.
*/
- public int deleteManyToManyAssociations(EntityBean ownerBean, String propertyName, Transaction t);
+ int deleteManyToManyAssociations(EntityBean ownerBean, String propertyName, Transaction t);
/**
* Delete a bean given it's type and id value.
@@ -63,31 +63,31 @@ public interface Persister {
* This will also cascade delete one level of children.
*
*/
- public int delete(Class> beanType, Object id, Transaction transaction);
+ int delete(Class> beanType, Object id, Transaction transaction);
/**
* Delete the bean.
*/
- public void delete(EntityBean entityBean, Transaction t);
+ void delete(EntityBean entityBean, Transaction t);
/**
* Delete multiple beans given a collection of Id values.
*/
- public void deleteMany(Class> beanType, Collection> ids, Transaction transaction);
+ void deleteMany(Class> beanType, Collection> ids, Transaction transaction);
/**
* Execute the Update.
*/
- public int executeOrmUpdate(Update> update, Transaction t);
+ int executeOrmUpdate(Update> update, Transaction t);
/**
* Execute the UpdateSql.
*/
- public int executeSqlUpdate(SqlUpdate update, Transaction t);
+ int executeSqlUpdate(SqlUpdate update, Transaction t);
/**
* Execute the CallableSql.
*/
- public int executeCallable(CallableSql callable, Transaction t);
+ int executeCallable(CallableSql callable, Transaction t);
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PstmtBatch.java b/src/main/java/com/avaje/ebeaninternal/server/core/PstmtBatch.java
index f796a3e74..5c6d23275 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/PstmtBatch.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/PstmtBatch.java
@@ -8,10 +8,10 @@ import java.sql.SQLException;
*/
public interface PstmtBatch {
- public void setBatchSize(PreparedStatement pstmt, int batchSize);
+ void setBatchSize(PreparedStatement pstmt, int batchSize);
- public void addBatch(PreparedStatement pstmt) throws SQLException;
+ void addBatch(PreparedStatement pstmt) throws SQLException;
- public int executeBatch(PreparedStatement pstmt, int expectedRows, String sql, boolean occCheck) throws SQLException;
+ int executeBatch(PreparedStatement pstmt, int expectedRows, String sql, boolean occCheck) throws SQLException;
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryEngine.java b/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryEngine.java
index e607fa9a1..999b0fdf4 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryEngine.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryEngine.java
@@ -6,6 +6,6 @@ public interface RelationalQueryEngine {
/**
* Find a list of beans using relational query.
*/
- public abstract Object findMany(RelationalQueryRequest request);
+ Object findMany(RelationalQueryRequest request);
}
\ No newline at end of file
diff --git a/src/main/java/com/avaje/ebeaninternal/server/ddl/PropertyVisitor.java b/src/main/java/com/avaje/ebeaninternal/server/ddl/PropertyVisitor.java
index d4f5834a0..03bcd6d65 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/ddl/PropertyVisitor.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/ddl/PropertyVisitor.java
@@ -13,41 +13,41 @@ public interface PropertyVisitor {
/**
* Visit a OneToMany or ManyToMany property.
*/
- public void visitMany(BeanPropertyAssocMany> p);
+ void visitMany(BeanPropertyAssocMany> p);
/**
* Visit the imported side of a OneToOne property.
*/
- public void visitOneImported(BeanPropertyAssocOne> p);
+ void visitOneImported(BeanPropertyAssocOne> p);
/**
* Visit the exported side of a OneToOne property.
*/
- public void visitOneExported(BeanPropertyAssocOne> p);
+ void visitOneExported(BeanPropertyAssocOne> p);
/**
* Visit an embedded property.
*/
- public void visitEmbedded(BeanPropertyAssocOne> p);
+ void visitEmbedded(BeanPropertyAssocOne> p);
/**
* Visit the scalar property of an embedded bean.
*/
- public void visitEmbeddedScalar(BeanProperty p, BeanPropertyAssocOne> embedded);
+ void visitEmbeddedScalar(BeanProperty p, BeanPropertyAssocOne> embedded);
/**
* Visit a scalar property.
*/
- public void visitScalar(BeanProperty p);
+ void visitScalar(BeanProperty p);
/**
* Visit a compound value object.
*/
- public void visitCompound(BeanPropertyCompound p);
+ void visitCompound(BeanPropertyCompound p);
/**
* Visit the scalar value inside a compound value object.
*/
- public void visitCompoundScalar(BeanPropertyCompound compound, BeanProperty p);
+ void visitCompoundScalar(BeanPropertyCompound compound, BeanProperty p);
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfoVisitor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfoVisitor.java
index d244a415f..33770c1d1 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfoVisitor.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfoVisitor.java
@@ -8,6 +8,6 @@ public interface InheritInfoVisitor {
/**
* visit the InheritInfo for this node.
*/
- public void visit(InheritInfo inheritInfo);
+ void visit(InheritInfo inheritInfo);
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedProperty.java
index c30686450..d70d7dab1 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedProperty.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedProperty.java
@@ -12,12 +12,12 @@ public interface GeneratedProperty {
/**
* Get the generated insert value for a specific property of a bean.
*/
- public Object getInsertValue(BeanProperty prop, EntityBean bean);
+ Object getInsertValue(BeanProperty prop, EntityBean bean);
/**
* Get the generated update value for a specific property of a bean.
*/
- public Object getUpdateValue(BeanProperty prop, EntityBean bean);
+ Object getUpdateValue(BeanProperty prop, EntityBean bean);
/**
* Return true if this should always be includes in an update statement.
@@ -25,23 +25,23 @@ public interface GeneratedProperty {
* Used to include GeneratedUpdateTimestamp in dynamic table updates.
*
*/
- public boolean includeInUpdate();
+ boolean includeInUpdate();
/**
* Return true if the property should be included in an update even if
* it is not loaded (ie. Last Updated Timestamp).
*/
- public boolean includeInAllUpdates();
+ boolean includeInAllUpdates();
/**
* Return true if this should be included in insert statements.
*/
- public boolean includeInInsert();
+ boolean includeInInsert();
/**
* Return true if the GeneratedProperty implies the DDL to create the DB
* column should have a not null constraint.
*/
- public boolean isDDLNotNullable();
+ boolean isDDLNotNullable();
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedId.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedId.java
index c2c3ec352..85ef238d2 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedId.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedId.java
@@ -14,18 +14,18 @@ import com.avaje.ebeaninternal.server.persist.dmlbind.BindableRequest;
*/
public interface ImportedId {
- public void addFkeys(String name);
+ void addFkeys(String name);
/**
* Return true if this id is a simple single scalar value. False if it is a
* compound id (embedded or multiple).
*/
- public boolean isScalar();
+ boolean isScalar();
/**
* Return the logical property name.
*/
- public String getLogicalName();
+ String getLogicalName();
/**
* For scalar id return the related single db column.
@@ -34,35 +34,35 @@ public interface ImportedId {
* one).
*
*/
- public String getDbColumn();
+ String getDbColumn();
/**
* Append the the SQL query statement.
*/
- public void sqlAppend(DbSqlContext ctx);
+ void sqlAppend(DbSqlContext ctx);
/**
* Append to the DML statement.
*/
- public void dmlAppend(GenerateDmlRequest request);
+ void dmlAppend(GenerateDmlRequest request);
/**
* Append to the DML statement to the where clause.
*/
- public void dmlWhere(GenerateDmlRequest request, EntityBean bean);
+ void dmlWhere(GenerateDmlRequest request, EntityBean bean);
/**
* Bind the value from the bean.
*/
- public Object bind(BindableRequest request, EntityBean bean) throws SQLException;
+ Object bind(BindableRequest request, EntityBean bean) throws SQLException;
/**
* For inserting into ManyToMany intersection.
*/
- public void buildImport(IntersectionRow row, EntityBean other);
+ void buildImport(IntersectionRow row, EntityBean other);
/**
* Used to derive a missing concatenated key from multiple imported keys.
*/
- public BeanProperty findMatchImport(String matchDbColumn);
+ BeanProperty findMatchImport(String matchDbColumn);
}
\ No newline at end of file
diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyValue.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyValue.java
index 39d045256..bfe82846c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyValue.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyValue.java
@@ -15,7 +15,7 @@ public interface ElPropertyValue extends ElPropertyDeploy {
/**
* Return the Id values for the given bean value.
*/
- public Object[] getAssocOneIdValues(EntityBean bean);
+ Object[] getAssocOneIdValues(EntityBean bean);
/**
* Return the Id expression string.
@@ -23,80 +23,80 @@ public interface ElPropertyValue extends ElPropertyDeploy {
* Typically used to produce id = ? expression strings.
*
*/
- public String getAssocOneIdExpr(String prefix, String operator);
+ String getAssocOneIdExpr(String prefix, String operator);
/**
* Return the logical id value expression taking into account embedded id's.
*/
- public String getAssocIdInValueExpr(int size);
+ String getAssocIdInValueExpr(int size);
/**
* Return the logical id in expression taking into account embedded id's.
*/
- public String getAssocIdInExpr(String prefix);
+ String getAssocIdInExpr(String prefix);
/**
* Return true if this is an ManyToOne or OneToOne associated bean property.
*/
- public boolean isAssocId();
+ boolean isAssocId();
/**
* Return true if any path of this path contains a Associated One or Many.
*/
- public boolean isAssocProperty();
+ boolean isAssocProperty();
/**
* Return true if the property is encrypted via Java.
*/
- public boolean isLocalEncrypted();
+ boolean isLocalEncrypted();
/**
* Return true if the property is encrypted in the DB.
*/
- public boolean isDbEncrypted();
+ boolean isDbEncrypted();
/**
* Return the deploy order for the property.
*/
- public int getDeployOrder();
+ int getDeployOrder();
/**
* Return the default StringParser for the scalar property.
*/
- public StringParser getStringParser();
+ StringParser getStringParser();
/**
* Return the default StringFormatter for the scalar property.
*/
- public StringFormatter getStringFormatter();
+ StringFormatter getStringFormatter();
/**
* Return true if the last type is "DateTime capable" - can support
* {@link #parseDateTime(long)}.
*/
- public boolean isDateTimeCapable();
+ boolean isDateTimeCapable();
/**
* Return the underlying JDBC type or 0 if this is not a scalar type.
*/
- public int getJdbcType();
+ int getJdbcType();
/**
* For DateTime capable scalar types convert the long systemTimeMillis into
* an appropriate java time (Date,Timestamp,Time,Calendar, JODA type etc).
*/
- public Object parseDateTime(long systemTimeMillis);
+ Object parseDateTime(long systemTimeMillis);
/**
* Return the value from a given entity bean.
*/
- public Object elGetValue(EntityBean bean);
+ Object elGetValue(EntityBean bean);
/**
* Return the value ensuring objects prior to the top scalar property are
* automatically populated.
*/
- public Object elGetReference(EntityBean bean);
+ Object elGetReference(EntityBean bean);
/**
* Set a value given a root level bean.
@@ -104,7 +104,7 @@ public interface ElPropertyValue extends ElPropertyDeploy {
* If populate then
*
*/
- public void elSetValue(EntityBean bean, Object value, boolean populate);
+ void elSetValue(EntityBean bean, Object value, boolean populate);
/**
* Convert the value to the expected type.
@@ -113,5 +113,5 @@ public interface ElPropertyValue extends ElPropertyDeploy {
* etc.
*
*/
- public Object elConvertType(Object value);
+ Object elConvertType(Object value);
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElSetValue.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElSetValue.java
index d1f7a79b6..ebc2075a7 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/el/ElSetValue.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElSetValue.java
@@ -5,6 +5,6 @@ public interface ElSetValue {
/**
* Set the value to the bean.
*/
- public void elSetValue(Object bean, Object value);
+ void elSetValue(Object bean, Object value);
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/jmx/MAdminAutofetchMBean.java b/src/main/java/com/avaje/ebeaninternal/server/jmx/MAdminAutofetchMBean.java
index 0e12f0dc2..ee6e10e78 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/jmx/MAdminAutofetchMBean.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/jmx/MAdminAutofetchMBean.java
@@ -7,38 +7,38 @@ public interface MAdminAutofetchMBean {
/**
* Return true if profiling is enabled.
*/
- public boolean isProfiling();
+ boolean isProfiling();
/**
* Set to true to enable profiling.
*/
- public void setProfiling(boolean enable);
+ void setProfiling(boolean enable);
/**
* Return true if autoFetch is enabled.
*/
- public boolean isQueryTuning();
+ boolean isQueryTuning();
/**
* Set to true to enable autoFetch.
*/
- public void setQueryTuning(boolean enable);
+ void setQueryTuning(boolean enable);
/**
* This controls whether autoFetch is used when it has not
* been explicitly set on a query via {@link Query#setAutofetch(boolean)}.
*/
- public String getMode();
+ String getMode();
/**
* List of the valid implicit modes that can be used.
*/
- public String getModeOptions();
+ String getModeOptions();
/**
* Set the auto fetch mode used when a query has not had {@link Query#setAutofetch(boolean)}.
*/
- public void setMode(String mode);
+ void setMode(String mode);
/**
* Return the max number of queries profiled (per query point).
@@ -47,7 +47,7 @@ public interface MAdminAutofetchMBean {
* point has profiled this number of queries it does not profile any more.
*
*/
- public int getProfilingBase();
+ int getProfilingBase();
/**
* Set a max number of queries to profile per query point.
@@ -56,20 +56,20 @@ public interface MAdminAutofetchMBean {
* is required for this query point.
*
*/
- public void setProfilingBase(int profilingMaxThreshold);
+ void setProfilingBase(int profilingMaxThreshold);
/**
* Returns the rate which profiling is collected.
* This is an int between 0 and 100.
*/
- public double getProfilingRate();
+ double getProfilingRate();
/**
* Set the rate at which profiling is collected after the base.
*
* @param rate a int between 0 and 100.
*/
- public void setProfilingRate(double rate);
+ void setProfilingRate(double rate);
/**
* Return the minimum number of queries profiled before autoFetch will start
@@ -79,7 +79,7 @@ public interface MAdminAutofetchMBean {
* profiling information is collected.
*
*/
- public int getProfilingMin();
+ int getProfilingMin();
/**
* Set the minimum number of queries profiled per query point before
@@ -89,13 +89,13 @@ public interface MAdminAutofetchMBean {
* autoFetch starts tuning the query.
*
*/
- public void setProfilingMin(int autoFetchMinThreshold);
+ void setProfilingMin(int autoFetchMinThreshold);
/**
* Fire a garbage collection (hint to the JVM). Assuming garbage collection
* fires this will gather the usage profiling information.
*/
- public String collectUsageViaGC();
+ String collectUsageViaGC();
/**
* This will take the current profiling information and update the "tuned query
@@ -104,7 +104,7 @@ public interface MAdminAutofetchMBean {
* This is done periodically and can also be manually invoked.
*
*/
- public String updateTunedQueryInfo();
+ String updateTunedQueryInfo();
/**
* Clear all the tuned query info.
@@ -113,7 +113,7 @@ public interface MAdminAutofetchMBean {
*
* @return the amount of tuned query information cleared.
*/
- public int clearTunedQueryInfo();
+ int clearTunedQueryInfo();
/**
* Clear all the profiling information.
@@ -125,21 +125,21 @@ public interface MAdminAutofetchMBean {
*
* @return the amount of profiled information cleared.
*/
- public int clearProfilingInfo();
+ int clearProfilingInfo();
/**
* Return the number of queries tuned by AutoFetch.
*/
- public int getTotalTunedQueryCount();
+ int getTotalTunedQueryCount();
/**
* Return the size of the TuneQuery map.
*/
- public int getTotalTunedQuerySize();
+ int getTotalTunedQuerySize();
/**
* Return the size of the profile map.
*/
- public int getTotalProfileSize();
+ int getTotalProfileSize();
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/ResourceContent.java b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/ResourceContent.java
index ebc844371..c0db9cf7a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/ResourceContent.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/ResourceContent.java
@@ -14,21 +14,21 @@ public interface ResourceContent {
/**
* The name of the content.
*/
- public String getName();
+ String getName();
/**
* The size of the content in bytes.
*/
- public long size();
+ long size();
/**
* The last modified timestamp of the content.
*/
- public long lastModified();
+ long lastModified();
/**
* The content itself.
*/
- public InputStream getInputStream() throws IOException;
+ InputStream getInputStream() throws IOException;
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/ResourceSource.java b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/ResourceSource.java
index 346df0d6f..fc5be7cdf 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/ResourceSource.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/ResourceSource.java
@@ -17,21 +17,21 @@ public interface ResourceSource {
* This will return null IF the ResourceSource is an unpacked WAR file.
*
*/
- public String getRealPath();
+ String getRealPath();
/**
* Find the content with a given entry name. This will return null if no
* matching content was found.
*/
- public ResourceContent getContent(String entry);
+ ResourceContent getContent(String entry);
/**
* Return the content as a String.
*/
- public String readString(ResourceContent content, int bufSize) throws IOException;
+ String readString(ResourceContent content, int bufSize) throws IOException;
/**
* Return the content as a byte[].
*/
- public byte[] readBytes(ResourceContent content, int bufSize) throws IOException;
+ byte[] readBytes(ResourceContent content, int bufSize) throws IOException;
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailListener.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailListener.java
index d1aa89a8a..19d283898 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailListener.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/MailListener.java
@@ -8,6 +8,6 @@ public interface MailListener {
/**
* Handle the message event.
*/
- public void handleEvent(MailEvent event);
+ void handleEvent(MailEvent event);
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/PersistExecute.java b/src/main/java/com/avaje/ebeaninternal/server/persist/PersistExecute.java
index b1df4f926..26807719f 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/PersistExecute.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/PersistExecute.java
@@ -19,36 +19,36 @@ public interface PersistExecute {
/**
* Create a BatchControl for the current transaction.
*/
- public BatchControl createBatchControl(SpiTransaction t);
+ BatchControl createBatchControl(SpiTransaction t);
/**
* Execute a Bean (or MapBean) insert.
*/
- public void executeInsertBean(PersistRequestBean request);
+ void executeInsertBean(PersistRequestBean request);
/**
* Execute a Bean (or MapBean) update.
*/
- public void executeUpdateBean(PersistRequestBean request);
+ void executeUpdateBean(PersistRequestBean request);
/**
* Execute a Bean (or MapBean) delete.
*/
- public void executeDeleteBean(PersistRequestBean request);
+ void executeDeleteBean(PersistRequestBean request);
/**
* Execute a Update.
*/
- public int executeOrmUpdate(PersistRequestOrmUpdate request);
+ int executeOrmUpdate(PersistRequestOrmUpdate request);
/**
* Execute a CallableSql.
*/
- public int executeSqlCallable(PersistRequestCallableSql request);
+ int executeSqlCallable(PersistRequestCallableSql request);
/**
* Execute a UpdateSql.
*/
- public int executeSqlUpdate(PersistRequestUpdateSql request);
+ int executeSqlUpdate(PersistRequestUpdateSql request);
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/PersistHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/PersistHandler.java
index 731953250..9854b233d 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/PersistHandler.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/PersistHandler.java
@@ -10,25 +10,25 @@ public interface PersistHandler {
/**
* Return the bind log.
*/
- public String getBindLog();
+ String getBindLog();
/**
* Get the sql and bind the statement.
*/
- public void bind() throws SQLException;
+ void bind() throws SQLException;
/**
* Add this for batch execution.
*/
- public void addBatch() throws SQLException;
+ void addBatch() throws SQLException;
/**
* Execute now for non-batch execution.
*/
- public void execute() throws SQLException;
+ void execute() throws SQLException;
/**
* Close resources including underlying preparedStatement.
*/
- public void close() throws SQLException;
+ void close() throws SQLException;
}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/reflect/KnownImmutable.java b/src/main/java/com/avaje/ebeaninternal/server/type/reflect/KnownImmutable.java
index 806e4b686..e9c56ee9c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/reflect/KnownImmutable.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/reflect/KnownImmutable.java
@@ -2,5 +2,5 @@ package com.avaje.ebeaninternal.server.type.reflect;
public interface KnownImmutable {
- public boolean isKnownImmutable(Class> cls);
+ boolean isKnownImmutable(Class> cls);
}