Cache model refactoring

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java

@@ -31,7 +31,8 @@ import java.util.*;
 /**
  * Various objects cache
  */
-public abstract class AbstractObjectCache<OWNER extends DBSObject, OBJECT extends DBSObject> implements DBSObjectCache<OWNER, OBJECT>
+public abstract class AbstractObjectCache<OWNER extends DBSObject, OBJECT extends DBSObject>
+    implements DBSObjectCache<OWNER, OBJECT>
 {
     private static final Log log = Log.getLog(AbstractObjectCache.class);
 

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCObjectCache.java

@@ -42,7 +42,7 @@ public abstract class JDBCObjectCache<OWNER extends DBSObject, OBJECT extends DB
 {
     public static final int DEFAULT_MAX_CACHE_SIZE = 1000000;
 
-    private static final Log log = Log.getLog(AbstractObjectCache.class);
+    private static final Log log = Log.getLog(JDBCObjectCache.class);
 
     // Maximum number of objects in cache
     private int maximumCacheSize = DEFAULT_MAX_CACHE_SIZE;

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCObjectLookupCache.java

@@ -33,7 +33,8 @@ import java.sql.SQLException;
 /**
  * Object lookup cache
  */
-public abstract class JDBCObjectLookupCache<OWNER extends DBSObject, OBJECT extends DBSObject> extends JDBCObjectCache<OWNER, OBJECT> implements JDBCObjectLookup<OWNER, OBJECT>
+public abstract class JDBCObjectLookupCache<OWNER extends DBSObject, OBJECT extends DBSObject>
+    extends JDBCObjectCache<OWNER, OBJECT> implements JDBCObjectLookup<OWNER, OBJECT>
 {
     protected JDBCObjectLookupCache() {
     }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCObjectSimpleCache.java

@@ -33,7 +33,9 @@ import java.sql.SQLException;
 /**
  * Simple objects cache.
  */
-public final class JDBCObjectSimpleCache<OWNER extends DBSObject, OBJECT extends DBSObject> extends JDBCObjectCache<OWNER, OBJECT> {
+public final class JDBCObjectSimpleCache<OWNER extends DBSObject, OBJECT extends DBSObject>
+    extends JDBCObjectCache<OWNER, OBJECT>
+{
     private final String query;
     private final Class<OBJECT> objectType;
     private final Object[] queryParameters;

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCStructCache.java

@@ -38,10 +38,13 @@ import java.sql.SQLException;
 import java.util.*;
 
 /**
- * JDBC structured objects cache. Stores objects themselves and their child objects.
+ * JDBC structured objects cache.
+ * Stores objects themselves and their child objects.
  */
-public abstract class JDBCStructCache<OWNER extends DBSObject, OBJECT extends DBSObject, CHILD extends DBSObject> extends
-    JDBCObjectCache<OWNER, OBJECT> implements DBSStructCache<OWNER, OBJECT, CHILD> {
+public abstract class JDBCStructCache<OWNER extends DBSObject, OBJECT extends DBSObject, CHILD extends DBSObject>
+    extends JDBCObjectCache<OWNER, OBJECT>
+    implements DBSStructCache<OWNER, OBJECT, CHILD>
+{
     private static final Log log = Log.getLog(JDBCStructCache.class);
 
     private final Object objectNameColumn;

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCStructLookupCache.java

@@ -31,10 +31,11 @@ import org.jkiss.dbeaver.model.struct.DBSObject;
 import java.sql.SQLException;
 
 /**
- * Various objects cache.
- * Simple cache which may read objects from database and keep them.
+ * Struct cache with ability to load/search single object by name.
  */
-public abstract class JDBCStructLookupCache<OWNER extends DBSObject, OBJECT extends DBSObject, CHILD extends DBSObject> extends JDBCStructCache<OWNER, OBJECT, CHILD> implements JDBCObjectLookup<OWNER, OBJECT>
+public abstract class JDBCStructLookupCache<OWNER extends DBSObject, OBJECT extends DBSObject, CHILD extends DBSObject>
+    extends JDBCStructCache<OWNER, OBJECT, CHILD>
+    implements JDBCObjectLookup<OWNER, OBJECT>
 {
 
     public JDBCStructLookupCache(Object objectNameColumn) {