From bdead7f2a0a652935c1246815352c6431b2daded Mon Sep 17 00:00:00 2001
From: Johno Crawford <johno.crawford@gmail.com>
Date: Mon, 6 Nov 2017 11:48:19 +0100
Subject: [PATCH] Add generics to LRUCache to avoid typed exceptions.

---
 src/com/mysql/jdbc/ConnectionImpl.java          | 20 ++++++++++----------
 src/com/mysql/jdbc/PerConnectionLRUFactory.java |  6 +++---
 src/com/mysql/jdbc/util/LRUCache.java           |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/com/mysql/jdbc/ConnectionImpl.java b/src/com/mysql/jdbc/ConnectionImpl.java
index e0fe1441..4f706bc7 100644
--- a/src/com/mysql/jdbc/ConnectionImpl.java
+++ b/src/com/mysql/jdbc/ConnectionImpl.java
@@ -546,7 +546,7 @@ public class ConnectionImpl extends ConnectionPropertiesImpl implements MySQLCon
      */
     private final CopyOnWriteArrayList<Statement> openStatements = new CopyOnWriteArrayList<Statement>();
 
-    private LRUCache parsedCallableStatementCache;
+    private LRUCache<CompoundCacheKey, CallableStatement.CallableStatementParamInfo> parsedCallableStatementCache;
 
     private boolean parserKnowsUnicode = false;
 
@@ -573,7 +573,7 @@ public class ConnectionImpl extends ConnectionPropertiesImpl implements MySQLCon
     private boolean readOnly = false;
 
     /** Cache of ResultSet metadata */
-    protected LRUCache resultSetMetadataCache;
+    protected LRUCache<String, CachedResultSetMetaData> resultSetMetadataCache;
 
     /** The timezone of the server */
     private TimeZone serverTimezoneTZ = null;
@@ -606,8 +606,8 @@ public class ConnectionImpl extends ConnectionPropertiesImpl implements MySQLCon
      */
     private boolean useServerPreparedStmts = false;
 
-    private LRUCache serverSideStatementCheckCache;
-    private LRUCache serverSideStatementCache;
+    private LRUCache<String, Boolean> serverSideStatementCheckCache;
+    private LRUCache<CompoundCacheKey, ServerPreparedStatement> serverSideStatementCache;
     private Calendar sessionCalendar;
 
     private Calendar utcCalendar;
@@ -2304,14 +2304,14 @@ public class ConnectionImpl extends ConnectionPropertiesImpl implements MySQLCon
             }
 
             if (getUseServerPreparedStmts()) {
-                this.serverSideStatementCheckCache = new LRUCache(cacheSize);
+                this.serverSideStatementCheckCache = new LRUCache<String, Boolean>(cacheSize);
 
-                this.serverSideStatementCache = new LRUCache(cacheSize) {
+                this.serverSideStatementCache = new LRUCache<CompoundCacheKey, ServerPreparedStatement>(cacheSize) {
 
                     private static final long serialVersionUID = 7692318650375988114L;
 
                     @Override
-                    protected boolean removeEldestEntry(java.util.Map.Entry<Object, Object> eldest) {
+                    protected boolean removeEldestEntry(java.util.Map.Entry<CompoundCacheKey, ServerPreparedStatement> eldest) {
                         if (this.maxElements <= 1) {
                             return false;
                         }
@@ -2319,7 +2319,7 @@ public class ConnectionImpl extends ConnectionPropertiesImpl implements MySQLCon
                         boolean removeIt = super.removeEldestEntry(eldest);
 
                         if (removeIt) {
-                            ServerPreparedStatement ps = (ServerPreparedStatement) eldest.getValue();
+                            ServerPreparedStatement ps = eldest.getValue();
                             ps.isCached = false;
                             ps.setClosed(false);
 
@@ -3155,7 +3155,7 @@ public class ConnectionImpl extends ConnectionPropertiesImpl implements MySQLCon
         }
 
         if (getCacheCallableStatements()) {
-            this.parsedCallableStatementCache = new LRUCache(getCallableStatementCacheSize());
+            this.parsedCallableStatementCache = new LRUCache<CompoundCacheKey, CallableStatement.CallableStatementParamInfo>(getCallableStatementCacheSize());
         }
 
         if (getAllowMultiQueries()) {
@@ -3163,7 +3163,7 @@ public class ConnectionImpl extends ConnectionPropertiesImpl implements MySQLCon
         }
 
         if (getCacheResultSetMetadata()) {
-            this.resultSetMetadataCache = new LRUCache(getMetadataCacheSize());
+            this.resultSetMetadataCache = new LRUCache<String, CachedResultSetMetaData>(getMetadataCacheSize());
         }
 
         if (getSocksProxyHost() != null) {
diff --git a/src/com/mysql/jdbc/PerConnectionLRUFactory.java b/src/com/mysql/jdbc/PerConnectionLRUFactory.java
index 5885e8c9..764aa4cd 100644
--- a/src/com/mysql/jdbc/PerConnectionLRUFactory.java
+++ b/src/com/mysql/jdbc/PerConnectionLRUFactory.java
@@ -40,13 +40,13 @@ public class PerConnectionLRUFactory implements CacheAdapterFactory<String, Pars
 
     class PerConnectionLRU implements CacheAdapter<String, ParseInfo> {
         private final int cacheSqlLimit;
-        private final LRUCache cache;
+        private final LRUCache<String, ParseInfo> cache;
         private final Connection conn;
 
         protected PerConnectionLRU(Connection forConnection, int cacheMaxSize, int maxKeySize) {
             final int cacheSize = cacheMaxSize;
             this.cacheSqlLimit = maxKeySize;
-            this.cache = new LRUCache(cacheSize);
+            this.cache = new LRUCache<String, ParseInfo>(cacheSize);
             this.conn = forConnection;
         }
 
@@ -56,7 +56,7 @@ public class PerConnectionLRUFactory implements CacheAdapterFactory<String, Pars
             }
 
             synchronized (this.conn.getConnectionMutex()) {
-                return (ParseInfo) this.cache.get(key);
+                return this.cache.get(key);
             }
         }
 
diff --git a/src/com/mysql/jdbc/util/LRUCache.java b/src/com/mysql/jdbc/util/LRUCache.java
index 3264992e..d72e752a 100644
--- a/src/com/mysql/jdbc/util/LRUCache.java
+++ b/src/com/mysql/jdbc/util/LRUCache.java
@@ -26,7 +26,7 @@ package com.mysql.jdbc.util;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
 
-public class LRUCache extends LinkedHashMap<Object, Object> {
+public class LRUCache<K, V> extends LinkedHashMap<K, V> {
     private static final long serialVersionUID = 1L;
     protected int maxElements;
 
@@ -41,7 +41,7 @@ public class LRUCache extends LinkedHashMap<Object, Object> {
      * @see java.util.LinkedHashMap#removeEldestEntry(java.util.Map.Entry)
      */
     @Override
-    protected boolean removeEldestEntry(Entry<Object, Object> eldest) {
+    protected boolean removeEldestEntry(Entry<K, V> eldest) {
         return (size() > this.maxElements);
     }
 }
-- 
2.13.6