From 831d2a61798e45d581314a1d9f55e492913b3567 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Fri, 31 Jul 2015 14:07:09 +1200
Subject: [PATCH] No effective change - add final modifier

---
 .../java/com/avaje/ebean/config/PropertyExpression.java   | 4 ++--
 src/main/java/com/avaje/ebean/config/PropertyMap.java     | 2 +-
 .../ebean/config/dbplatform/SequenceIdGenerator.java      | 2 +-
 .../com/avaje/ebeaninternal/api/TransactionEvent.java     | 2 +-
 .../avaje/ebeaninternal/api/TransactionEventBeans.java    | 2 +-
 .../avaje/ebeaninternal/api/TransactionEventTable.java    | 2 +-
 .../avaje/ebeaninternal/server/autofetch/Statistics.java  | 4 ++--
 .../server/autofetch/StatisticsNodeUsage.java             | 2 +-
 .../server/cluster/socket/SocketClusterBroadcast.java     | 2 +-
 .../server/core/PersistRequestOrmUpdate.java              | 2 +-
 .../deploy/generatedproperty/UpdateTimestampFactory.java  | 2 +-
 .../server/deploy/parse/SqlReservedWords.java             | 2 +-
 .../ebeaninternal/server/expression/SimpleExpression.java | 2 +-
 .../server/lib/resource/UrlResourceContent.java           | 7 +------
 .../ebeaninternal/server/lib/sql/PooledConnection.java    | 2 +-
 .../server/lib/sql/SimpleDataSourceAlert.java             | 8 ++++----
 .../com/avaje/ebeaninternal/server/query/SqlJoinType.java | 4 ++--
 .../avaje/ebeaninternal/server/query/SqlTreeAlias.java    | 8 ++++----
 .../ebeaninternal/server/query/SqlTreeProperties.java     | 4 ++--
 .../server/transaction/RemoteTransactionEvent.java        | 2 +-
 .../ebeaninternal/server/transaction/TransactionMap.java  | 2 +-
 .../avaje/ebeaninternal/server/type/ScalarTypeFile.java   | 2 +-
 .../ebeaninternal/server/type/ScalarTypeMonthDay.java     | 2 +-
 .../java/com/avaje/ebeaninternal/util/SortByClause.java   | 2 +-
 24 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/avaje/ebean/config/PropertyExpression.java b/src/main/java/com/avaje/ebean/config/PropertyExpression.java
index 3c7bae94f..67c5bc1df 100644
--- a/src/main/java/com/avaje/ebean/config/PropertyExpression.java
+++ b/src/main/java/com/avaje/ebean/config/PropertyExpression.java
@@ -27,12 +27,12 @@ final class PropertyExpression {
   /**
    * Used to detect the start of an expression.
    */
-  private static String START = "${";
+  private static final String START = "${";
 
   /**
    * Used to detect the end of an expression.
    */
-  private static String END = "}";
+  private static final String END = "}";
 
   /**
    * Specify the PropertyHolder.
diff --git a/src/main/java/com/avaje/ebean/config/PropertyMap.java b/src/main/java/com/avaje/ebean/config/PropertyMap.java
index 18597cca3..9667304e8 100644
--- a/src/main/java/com/avaje/ebean/config/PropertyMap.java
+++ b/src/main/java/com/avaje/ebean/config/PropertyMap.java
@@ -16,7 +16,7 @@ public final class PropertyMap implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
-  private LinkedHashMap<String, String> map = new LinkedHashMap<String, String>();
+  private final LinkedHashMap<String, String> map = new LinkedHashMap<String, String>();
 
   public static Properties defaultProperties() {
     PropertyMap propertyMap = PropertyMapLoader.loadGlobalProperties();
diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java b/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java
index df9cd9cfe..6de3efae2 100644
--- a/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java
+++ b/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java
@@ -42,7 +42,7 @@ public abstract class SequenceIdGenerator implements IdGenerator {
 
   protected final ArrayList<Long> idList = new ArrayList<Long>(50);
 
-  protected int batchSize;
+  protected final int batchSize;
 
   protected int currentlyBackgroundLoading;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/api/TransactionEvent.java b/src/main/java/com/avaje/ebeaninternal/api/TransactionEvent.java
index 8b49fa2ae..14a52af42 100644
--- a/src/main/java/com/avaje/ebeaninternal/api/TransactionEvent.java
+++ b/src/main/java/com/avaje/ebeaninternal/api/TransactionEvent.java
@@ -23,7 +23,7 @@ public class TransactionEvent implements Serializable {
    * Flag indicating this is a local transaction (not from another server in
    * the cluster).
    */
-  private transient boolean local;
+  private final transient boolean local;
 
   private TransactionEventTable eventTables;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventBeans.java b/src/main/java/com/avaje/ebeaninternal/api/TransactionEventBeans.java
index 1e976c3a1..612dcb153 100644
--- a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventBeans.java
+++ b/src/main/java/com/avaje/ebeaninternal/api/TransactionEventBeans.java
@@ -14,7 +14,7 @@ import com.avaje.ebeaninternal.server.core.PersistRequestBean;
  */
 public class TransactionEventBeans {
 
-	ArrayList<PersistRequestBean<?>> requests = new ArrayList<PersistRequestBean<?>>();
+  final ArrayList<PersistRequestBean<?>> requests = new ArrayList<PersistRequestBean<?>>();
 
 	/**
 	 * Return the list of PersistRequests that BeanListeners are interested in.
diff --git a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventTable.java b/src/main/java/com/avaje/ebeaninternal/api/TransactionEventTable.java
index e1c0e9961..08d50ee82 100644
--- a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventTable.java
+++ b/src/main/java/com/avaje/ebeaninternal/api/TransactionEventTable.java
@@ -70,7 +70,7 @@ public final class TransactionEventTable implements Serializable {
 		
 		private static final long serialVersionUID = -1958317571064162089L;
 		
-		private String table;
+		private final String table;
 		private boolean insert;
 		private boolean update;
 		private boolean delete;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java
index 14ad6e9f7..c4ee931e2 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/Statistics.java
@@ -25,9 +25,9 @@ public class Statistics implements Serializable {
 	
 	private int counter;
 	
-	private Map<String, StatisticsQuery> queryStatsMap = new LinkedHashMap<String, StatisticsQuery>();
+	private final Map<String, StatisticsQuery> queryStatsMap = new LinkedHashMap<String, StatisticsQuery>();
 
-	private Map<String, StatisticsNodeUsage> nodeUsageMap = new LinkedHashMap<String, StatisticsNodeUsage>();
+	private final Map<String, StatisticsNodeUsage> nodeUsageMap = new LinkedHashMap<String, StatisticsNodeUsage>();
 
 	private final String monitor = new String();
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/autofetch/StatisticsNodeUsage.java b/src/main/java/com/avaje/ebeaninternal/server/autofetch/StatisticsNodeUsage.java
index ff4bc9357..ff08f08a1 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/autofetch/StatisticsNodeUsage.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/autofetch/StatisticsNodeUsage.java
@@ -37,7 +37,7 @@ public class StatisticsNodeUsage implements Serializable {
 	
 	private boolean modified;
 	
-	private Set<String> aggregateUsed = new LinkedHashSet<String>();
+	private final Set<String> aggregateUsed = new LinkedHashSet<String>();
 
 	public StatisticsNodeUsage(String path, boolean queryTuningAddVersion) {
 		this.path = path;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/SocketClusterBroadcast.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/SocketClusterBroadcast.java
index 3b73b6e3a..8d3945b9d 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/SocketClusterBroadcast.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/SocketClusterBroadcast.java
@@ -32,7 +32,7 @@ public class SocketClusterBroadcast implements ClusterBroadcast {
 
   private final SocketClusterListener listener;
 
-  private SocketClient[] members;
+  private final SocketClient[] members;
 
   private ClusterManager clusterManager;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestOrmUpdate.java b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestOrmUpdate.java
index ca2c537e9..119068d3e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestOrmUpdate.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestOrmUpdate.java
@@ -17,7 +17,7 @@ public final class PersistRequestOrmUpdate extends PersistRequest {
 
 	private final BeanDescriptor<?> beanDescriptor;
 	
-	private SpiUpdate<?> ormUpdate;
+	private final SpiUpdate<?> ormUpdate;
 
 	private int rowCount;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
index b9918844c..979352638 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java
@@ -19,7 +19,7 @@ public class UpdateTimestampFactory {
 
 	final GeneratedUpdateLong longTime = new GeneratedUpdateLong();
 
-  Map<Class<?>, GeneratedProperty> map = new HashMap<Class<?>, GeneratedProperty>();
+  final Map<Class<?>, GeneratedProperty> map = new HashMap<Class<?>, GeneratedProperty>();
 
   public UpdateTimestampFactory() {
     map.put(Timestamp.class, new GeneratedUpdateTimestamp());
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/SqlReservedWords.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/SqlReservedWords.java
index eeec13ac3..465fc9df0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/SqlReservedWords.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/SqlReservedWords.java
@@ -45,7 +45,7 @@ public class SqlReservedWords {
 		+",WHERE,WITH";
 
 	
-	private static HashSet<String> keywords = new HashSet<String>();
+	private static final HashSet<String> keywords = new HashSet<String>();
 	static {
 		
 		String[] initialKeywords = baseKeyWords.split(",");
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java
index 1976e2e3e..80a495f1f 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java
@@ -13,7 +13,7 @@ public class SimpleExpression extends AbstractExpression {
   enum Op {
     EQ(" = ? "), NOT_EQ(" <> ? "), LT(" < ? "), LT_EQ(" <= ? "), GT(" > ? "), GT_EQ(" >= ? ");
 
-    String exp;
+    final String exp;
 
     Op(String exp) {
       this.exp = exp;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/UrlResourceContent.java b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/UrlResourceContent.java
index b23554aa5..38efbc3a4 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/resource/UrlResourceContent.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/resource/UrlResourceContent.java
@@ -11,12 +11,7 @@ import java.util.Date;
  */
 public class UrlResourceContent implements ResourceContent {
 
-    /**
-     * The underlying resource.
-     */
-    //URL url;
-
-    String entryName;
+    final String entryName;
 
     URLConnection con;
     
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/PooledConnection.java b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/PooledConnection.java
index 611daa827..0eb44f2a5 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/PooledConnection.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/PooledConnection.java
@@ -156,7 +156,7 @@ public class PooledConnection extends ConnectionDelegator {
    */
   private StackTraceElement[] stackTrace;
 
-  private int maxStackTrace;
+  private final int maxStackTrace;
 
   /**
    * Slot position in the BusyConnectionBuffer.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/SimpleDataSourceAlert.java b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/SimpleDataSourceAlert.java
index 4791732b2..03af1d41e 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/sql/SimpleDataSourceAlert.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/sql/SimpleDataSourceAlert.java
@@ -21,11 +21,11 @@ public class SimpleDataSourceAlert implements DataSourceAlert, MailListener {
 
   private static final Logger logger = LoggerFactory.getLogger(SimpleDataSourceAlert.class);
 
-  private static String alertMailServerName = System.getProperty("ebean.datasource.alert.mailserver");
+  private static final String alertMailServerName = System.getProperty("ebean.datasource.alert.mailserver");
 
-  private static String fromUser = System.getProperty("ebean.datasource.alert.fromUser");
-  private static String fromEmail = System.getProperty("ebean.datasource.alert.fromEmail");
-  private static String toEmail = System.getProperty("ebean.datasource.alert.toEmail");
+  private static final String fromUser = System.getProperty("ebean.datasource.alert.fromUser");
+  private static final String fromEmail = System.getProperty("ebean.datasource.alert.fromEmail");
+  private static final String toEmail = System.getProperty("ebean.datasource.alert.toEmail");
 
   /**
    * Create a SimpleAlerter.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlJoinType.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlJoinType.java
index 49daa320f..b52d15ebc 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlJoinType.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlJoinType.java
@@ -19,8 +19,8 @@ public enum SqlJoinType {
    * It is automatically determined based on cardinality and optionality.
    */
   AUTO("JOIN-TYPE-AUTO-LITERAL-NOT-USED");
-  
-  String literal;
+
+  final String literal;
 
   SqlJoinType(String literal) {
     this.literal = literal;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeAlias.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeAlias.java
index f34b6ce22..92805a673 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeAlias.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeAlias.java
@@ -20,15 +20,15 @@ public class SqlTreeAlias {
 
   private int manyWhereCounter;
 
-  private TreeSet<String> joinProps = new TreeSet<String>();
+  private final TreeSet<String> joinProps = new TreeSet<String>();
 
   private HashSet<String> embeddedPropertyJoins;
 
-  private TreeSet<String> manyWhereJoinProps = new TreeSet<String>();
+  private final TreeSet<String> manyWhereJoinProps = new TreeSet<String>();
 
-  private HashMap<String, String> aliasMap = new HashMap<String, String>();
+  private final HashMap<String, String> aliasMap = new HashMap<String, String>();
 
-  private HashMap<String, String> manyWhereAliasMap = new HashMap<String, String>();
+  private final HashMap<String, String> manyWhereAliasMap = new HashMap<String, String>();
 
   private final String rootTableAlias;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java
index ae6b38a33..d1f69d22d 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java
@@ -24,12 +24,12 @@ public class SqlTreeProperties {
   /**
    * The bean properties in order.
    */
-  private List<BeanProperty> propsList = new ArrayList<BeanProperty>();
+  private final List<BeanProperty> propsList = new ArrayList<BeanProperty>();
 
   /**
    * Maintain a list of property names to detect embedded bean additions.
    */
-  private LinkedHashSet<String> propNames = new LinkedHashSet<String>();
+  private final LinkedHashSet<String> propNames = new LinkedHashSet<String>();
 
   private boolean allProperties;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/RemoteTransactionEvent.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/RemoteTransactionEvent.java
index eb7f62d57..1b32ad9d3 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/RemoteTransactionEvent.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/RemoteTransactionEvent.java
@@ -10,7 +10,7 @@ import java.util.List;
 
 public class RemoteTransactionEvent implements Runnable {
 
-    private List<BeanPersistIds> beanPersistList = new ArrayList<BeanPersistIds>();
+    private final List<BeanPersistIds> beanPersistList = new ArrayList<BeanPersistIds>();
     
     private List<TableIUD> tableList;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionMap.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionMap.java
index e3cc71f83..4dd9ce014 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionMap.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionMap.java
@@ -15,7 +15,7 @@ public class TransactionMap {
     /**
      * Map of State by serverName. 
      */
-    private HashMap<String,State> map = new HashMap<String, State>();
+    private final HashMap<String,State> map = new HashMap<String, State>();
     
     public String toString() {
     	return map.toString();
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java
index 83e8946ca..6fe12cf94 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java
@@ -16,7 +16,7 @@ import java.sql.Types;
  */
 public class ScalarTypeFile extends ScalarTypeBase<File> {
 
-  private static Logger logger = LoggerFactory.getLogger(ScalarTypeFile.class);
+  private static final Logger logger = LoggerFactory.getLogger(ScalarTypeFile.class);
 
   private final String prefix;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java
index f4230a181..60509fe95 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java
@@ -21,7 +21,7 @@ import java.time.MonthDay;
  */
 public class ScalarTypeMonthDay extends ScalarTypeBase<MonthDay> {
 
-  protected int year;
+  protected final int year;
 
   /**
    * Construct with a year of 2000 (which is a leap year).
diff --git a/src/main/java/com/avaje/ebeaninternal/util/SortByClause.java b/src/main/java/com/avaje/ebeaninternal/util/SortByClause.java
index 33cfb1e02..4c06894e1 100644
--- a/src/main/java/com/avaje/ebeaninternal/util/SortByClause.java
+++ b/src/main/java/com/avaje/ebeaninternal/util/SortByClause.java
@@ -27,7 +27,7 @@ public class SortByClause {
 	public static final String DESC = "desc";
 	
 	
-	private List<Property> properties = new ArrayList<Property>();
+	private final List<Property> properties = new ArrayList<Property>();
 	
 	/**
 	 * Return the number of properties in the clause.