Merge pull request #3598 from ebean-orm/feature/tidy-QueryCacheEntry

Tidy QueryCacheEntry, final class and use accessors

Author: rbygrave

ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java

@@ -11,7 +11,7 @@
  * the query cache entry is treated as invalid.
  * </p>
  */
-public class QueryCacheEntry {
+public final class QueryCacheEntry {
 
   private final Object value;
   private final Set<String> dependentTables;
@@ -33,21 +33,21 @@ public QueryCacheEntry(Object value, Set<String> dependentTables, Instant timest
   /**
    * Return the actual query result.
    */
-  public Object getValue() {
+  public Object value() {
     return value;
   }
 
   /**
    * Return the tables the query result is dependent on.
    */
-  public Set<String> getDependentTables() {
+  public Set<String> dependentTables() {
     return dependentTables;
   }
 
   /**
    * Return the timestamp used to check for modifications on the dependent tables.
    */
-  public Instant getTimestamp() {
+  public Instant timestamp() {
     return timestamp;
   }
 }

ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java

@@ -23,7 +23,7 @@ public DefaultServerQueryCache(DefaultServerCacheConfig config) {
 
   @Override
   protected Object unwrapEntry(CacheEntry entry) {
-    return ((QueryCacheEntry) entry.getValue()).getValue();
+    return ((QueryCacheEntry) entry.getValue()).value();
   }
 
   @Override

ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java

@@ -60,9 +60,9 @@ boolean isValid(Set<String> tables, Instant sinceTime) {
 
   @Override
   public boolean isValid(QueryCacheEntry entry) {
-    Set<String> dependentTables = entry.getDependentTables();
+    Set<String> dependentTables = entry.dependentTables();
     if (dependentTables != null && !dependentTables.isEmpty()) {
-      return isValid(dependentTables, entry.getTimestamp());
+      return isValid(dependentTables, entry.timestamp());
     }
     return true;
   }