From efe4e69ed10c4be26395666b8e245182144ea4d0 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Fri, 31 Jul 2015 13:05:22 +1200 Subject: [PATCH] No effective change - Code cleanup,remove unnecessary public modifier on interfaces --- src/main/java/com/avaje/ebean/SqlRow.java | 2 +- .../server/autofetch/AutoFetchManager.java | 60 +++++++++---------- .../server/deploy/BeanCollectionHelp.java | 18 +++--- .../server/deploy/BeanDescriptorMap.java | 10 ++-- .../server/persist/BeanPersister.java | 6 +- .../server/persist/BeanPersisterFactory.java | 2 +- .../server/query/DefaultSqlRow.java | 2 +- 7 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/avaje/ebean/SqlRow.java b/src/main/java/com/avaje/ebean/SqlRow.java index 3fc483212..ffb1f949a 100644 --- a/src/main/java/com/avaje/ebean/SqlRow.java +++ b/src/main/java/com/avaje/ebean/SqlRow.java @@ -153,7 +153,7 @@ public interface SqlRow extends Serializable, Map { /** * Put all the values from t into this map. */ - void putAll(Map t); + void putAll(Map t); /** * Return the size of the map. diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoFetchManager.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoFetchManager.java index c5e5a4c3f..bab59e857 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoFetchManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/AutoFetchManager.java @@ -27,12 +27,12 @@ public interface AutoFetchManager extends NodeUsageListener { /** * Set the owning ebean server. */ - public void setOwner(SpiEbeanServer server, ServerConfig serverConfig); + void setOwner(SpiEbeanServer server, ServerConfig serverConfig); /** * Clear the query execution statistics. */ - public void clearQueryStatistics(); + void clearQueryStatistics(); /** * Clear all the tuned query info. @@ -40,7 +40,7 @@ public interface AutoFetchManager extends NodeUsageListener { * Should only need do this for testing and playing around. *

*/ - public int clearTunedQueryInfo(); + int clearTunedQueryInfo(); /** * Clear all the profiling information. @@ -51,7 +51,7 @@ public interface AutoFetchManager extends NodeUsageListener { * Should only need do this for testing and playing around. *

*/ - public int clearProfilingInfo(); + int clearProfilingInfo(); /** * On shutdown fire garbage collection and collect statistics. Note that @@ -59,17 +59,17 @@ public interface AutoFetchManager extends NodeUsageListener { * collector plenty of time to do its thing and collect the profile * information. */ - public void shutdown(); + void shutdown(); /** * Return the current tuned fetch information for a given queryPoint key. */ - public TunedQueryInfo getTunedQueryInfo(String queryPointKey); + TunedQueryInfo getTunedQueryInfo(String queryPointKey); /** * Return the current Statistics for a given queryPoint key. */ - public Statistics getStatistics(String queryPointKey); + Statistics getStatistics(String queryPointKey); /** * Iterate the tuned fetch info. @@ -77,7 +77,7 @@ public interface AutoFetchManager extends NodeUsageListener { * This should be a read only iteration. *

*/ - public Iterator iterateTunedQueryInfo(); + Iterator iterateTunedQueryInfo(); /** * Iterate the node usage statistics. @@ -85,12 +85,12 @@ public interface AutoFetchManager extends NodeUsageListener { * This should be a read only iteration. *

*/ - public Iterator iterateStatistics(); + Iterator iterateStatistics(); /** * Return true if profiling is enabled. */ - public boolean isProfiling(); + boolean isProfiling(); /** * Set to true to enable profiling. @@ -107,39 +107,39 @@ public interface AutoFetchManager extends NodeUsageListener { * profiling information. *

*/ - public void setProfiling(boolean enable); + void setProfiling(boolean enable); /** * Return true if automatic query tuning is enabled. */ - public boolean isQueryTuning(); + boolean isQueryTuning(); /** * Set to true to enable automatic query tuning. */ - 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)}. + * set on a query via {@link Query#setAutofetch(boolean)}. */ - public AutofetchMode getMode(); + AutofetchMode getMode(); /** * Set the auto fetch mode used when a query has not had - * {@link Query#setAutoFetch(boolean)}. + * {@link Query#setAutofetch(boolean)}. */ - public void setMode(AutofetchMode Mode); + void setMode(AutofetchMode Mode); /** * Return the profiling rate (int between 0 and 100). */ - public double getProfilingRate(); + double getProfilingRate(); /** * Set the profiling rate (int between 0 and 100). */ - public void setProfilingRate(double rate); + void setProfilingRate(double rate); /** * Return the max number of queries profiled (per query point). @@ -148,7 +148,7 @@ public interface AutoFetchManager extends NodeUsageListener { * 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. @@ -157,7 +157,7 @@ public interface AutoFetchManager extends NodeUsageListener { * is required for this query point. *

*/ - public void setProfilingBase(int profilingMax); + void setProfilingBase(int profilingMax); /** * Return the minimum number of queries profiled before autoFetch will start @@ -167,7 +167,7 @@ public interface AutoFetchManager extends NodeUsageListener { * profiling information is collected. *

*/ - public int getProfilingMin(); + int getProfilingMin(); /** * Set the minimum number of queries profiled per query point before @@ -177,13 +177,13 @@ public interface AutoFetchManager extends NodeUsageListener { * 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(long waitMillis); + String collectUsageViaGC(long waitMillis); /** * This will take the current profiling information and update the "tuned @@ -195,7 +195,7 @@ public interface AutoFetchManager extends NodeUsageListener { * This returns a string summary of the updates that occurred. *

*/ - public String updateTunedQueryInfo(); + String updateTunedQueryInfo(); /** * Called when a query thinks it should be automatically tuned by autoFetch. @@ -208,7 +208,7 @@ public interface AutoFetchManager extends NodeUsageListener { * This will also determine if the query should be profiled. *

*/ - public boolean tuneQuery(SpiQuery query); + boolean tuneQuery(SpiQuery query); /** * Collect query profiling information. @@ -224,21 +224,21 @@ public interface AutoFetchManager extends NodeUsageListener { * @param micros * the query executing time in microseconds */ - public void collectQueryInfo(ObjectGraphNode node, long beans, long micros); + void collectQueryInfo(ObjectGraphNode node, long beans, long micros); /** * 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/deploy/BeanCollectionHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelp.java index f6c8d2d7b..ce043377d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelp.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelp.java @@ -19,7 +19,7 @@ public interface BeanCollectionHelp { /** * Set the EbeanServer that owns the configuration. */ - public void setLoader(BeanCollectionLoader loader); + void setLoader(BeanCollectionLoader loader); /** * Return the mechanism to add beans to the underlying collection. @@ -27,41 +27,41 @@ public interface BeanCollectionHelp { * For Map's this needs to take the mapKey. *

*/ - public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey); + BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey); /** * Create an empty collection of the correct type without a parent bean. */ - public BeanCollection createEmptyNoParent(); + BeanCollection createEmptyNoParent(); /** * Create an empty collection of the correct type. */ - public BeanCollection createEmpty(EntityBean bean); + BeanCollection createEmpty(EntityBean bean); /** * Add a bean to the List Set or Map. */ - public void add(BeanCollection collection, EntityBean bean); + void add(BeanCollection collection, EntityBean bean); /** * Create a lazy loading proxy for a List Set or Map. */ - public BeanCollection createReference(EntityBean parentBean); + BeanCollection createReference(EntityBean parentBean); /** * Refresh the List Set or Map. */ - public void refresh(EbeanServer server, Query query, Transaction t, EntityBean parentBean); + void refresh(EbeanServer server, Query query, Transaction t, EntityBean parentBean); /** * Apply the new refreshed BeanCollection to the appropriate property of the parent bean. */ - public void refresh(BeanCollection bc, EntityBean parentBean); + void refresh(BeanCollection bc, EntityBean parentBean); /** * Write the collection out as json. */ - public void jsonWrite(WriteJson ctx, String name, Object collection, boolean explicitInclude) throws IOException; + void jsonWrite(WriteJson ctx, String name, Object collection, boolean explicitInclude) throws IOException; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java index fced60c5f..0f231d923 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java @@ -15,23 +15,23 @@ public interface BeanDescriptorMap { /** * Return the name of the server/database. */ - public String getServerName(); + String getServerName(); /** * Return the Cache Manager. */ - public ServerCacheManager getCacheManager(); + ServerCacheManager getCacheManager(); /** * Return the BeanDescriptor for a given class. */ - public BeanDescriptor getBeanDescriptor(Class entityType); + BeanDescriptor getBeanDescriptor(Class entityType); /** * Return the Encrypt key given the table and column name. */ - public EncryptKey getEncryptKey(String tableName, String columnName); + EncryptKey getEncryptKey(String tableName, String columnName); - public IdBinder createIdBinder(BeanProperty id); + IdBinder createIdBinder(BeanProperty id); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersister.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersister.java index 6c11f821a..31d8adc28 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersister.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersister.java @@ -12,16 +12,16 @@ public interface BeanPersister { /** * execute the insert bean request. */ - public void insert(PersistRequestBean request) throws PersistenceException; + void insert(PersistRequestBean request) throws PersistenceException; /** * execute the update bean request. */ - public void update(PersistRequestBean request) throws PersistenceException; + void update(PersistRequestBean request) throws PersistenceException; /** * execute the delete bean request. */ - public void delete(PersistRequestBean request) throws PersistenceException; + void delete(PersistRequestBean request) throws PersistenceException; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersisterFactory.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersisterFactory.java index 18130784e..eced4bee4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersisterFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersisterFactory.java @@ -10,6 +10,6 @@ public interface BeanPersisterFactory { /** * Create the BeanPersister implemenation for a given type. */ - public BeanPersister create(BeanDescriptor desc); + BeanPersister create(BeanDescriptor desc); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java index 04c4088e4..1cfad0bac 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java @@ -192,7 +192,7 @@ public class DefaultSqlRow implements SqlRow { return map.keySet(); } - public void putAll(Map t) { + public void putAll(Map t) { map.putAll(t); }