From: Benny Baumann <BenBE@geshi.org>
Date: Fri, 5 Jun 2015 17:01:29 +0000 (+0200)
Subject: fix: Include visibility and read-only specifications wherever sensible.
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=a7aea81ff9eebb35aef0f91dfa8b5e3c797568f8

fix: Include visibility and read-only specifications wherever sensible.
---

diff --git a/src/org/cacert/gigi/database/GigiPreparedStatement.java b/src/org/cacert/gigi/database/GigiPreparedStatement.java
index 55ed6ad3..6d967648 100644
--- a/src/org/cacert/gigi/database/GigiPreparedStatement.java
+++ b/src/org/cacert/gigi/database/GigiPreparedStatement.java
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
 
 public class GigiPreparedStatement {
 
-    PreparedStatement target;
+    private PreparedStatement target;
 
     public GigiPreparedStatement(PreparedStatement preparedStatement) {
         target = preparedStatement;
@@ -106,4 +106,5 @@ public class GigiPreparedStatement {
         // TODO Auto-generated method stub
 
     }
+
 }
diff --git a/src/org/cacert/gigi/database/GigiResultSet.java b/src/org/cacert/gigi/database/GigiResultSet.java
index 28fda28a..d31c9ccb 100644
--- a/src/org/cacert/gigi/database/GigiResultSet.java
+++ b/src/org/cacert/gigi/database/GigiResultSet.java
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
 
 public class GigiResultSet implements Closeable {
 
-    ResultSet target;
+    private ResultSet target;
 
     public GigiResultSet(ResultSet target) {
         this.target = target;
diff --git a/src/org/cacert/gigi/database/SQLFileManager.java b/src/org/cacert/gigi/database/SQLFileManager.java
index e51e5216..9aaebfae 100644
--- a/src/org/cacert/gigi/database/SQLFileManager.java
+++ b/src/org/cacert/gigi/database/SQLFileManager.java
@@ -12,11 +12,11 @@ public class SQLFileManager {
 
     public static enum ImportType {
         /**
-         * Execute Script as-as
+         * Execute Script as-is
          */
         PRODUCTION,
         /**
-         * Execute Script, but changing Engine=InnoDB to Engine=Memory
+         * Execute Script, but change Engine=InnoDB to Engine=Memory
          */
         TEST,
         /**
diff --git a/src/org/cacert/gigi/dbObjects/CACertificate.java b/src/org/cacert/gigi/dbObjects/CACertificate.java
index aa12d08f..b6ede830 100644
--- a/src/org/cacert/gigi/dbObjects/CACertificate.java
+++ b/src/org/cacert/gigi/dbObjects/CACertificate.java
@@ -19,15 +19,15 @@ import org.cacert.gigi.database.GigiResultSet;
 
 public class CACertificate implements IdCachable {
 
-    final String keyname;
+    private final String keyname;
 
-    final int id;
+    private final int id;
 
-    CACertificate parent = null;
+    private CACertificate parent = null;
 
-    final X509Certificate cert;
+    private final X509Certificate cert;
 
-    final String link;
+    private final String link;
 
     private CACertificate(int id) {
         this.id = id;
@@ -172,4 +172,5 @@ public class CACertificate implements IdCachable {
     public boolean isSelfsigned() {
         return this == getParent();
     }
+
 }
diff --git a/src/org/cacert/gigi/dbObjects/CertificateOwner.java b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
index 132b2787..5be24fc8 100644
--- a/src/org/cacert/gigi/dbObjects/CertificateOwner.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
@@ -8,7 +8,7 @@ import org.cacert.gigi.database.GigiResultSet;
 
 public abstract class CertificateOwner implements IdCachable {
 
-    private static ObjectCache<CertificateOwner> myCache = new ObjectCache<>();
+    private static final ObjectCache<CertificateOwner> myCache = new ObjectCache<>();
 
     private int id;
 
diff --git a/src/org/cacert/gigi/dbObjects/CertificateProfile.java b/src/org/cacert/gigi/dbObjects/CertificateProfile.java
index 43c1dd5c..d9a9e34f 100644
--- a/src/org/cacert/gigi/dbObjects/CertificateProfile.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateProfile.java
@@ -22,9 +22,9 @@ public class CertificateProfile implements IdCachable {
 
     private final String visibleName;
 
-    private static HashMap<String, CertificateProfile> byName = new HashMap<>();
+    private static final HashMap<String, CertificateProfile> byName = new HashMap<>();
 
-    private static HashMap<Integer, CertificateProfile> byId = new HashMap<>();
+    private static final HashMap<Integer, CertificateProfile> byId = new HashMap<>();
 
     private final Map<String, PropertyTemplate> pt;
 
@@ -252,4 +252,5 @@ public class CertificateProfile implements IdCachable {
         }
         return true;
     }
+
 }
diff --git a/src/org/cacert/gigi/dbObjects/Digest.java b/src/org/cacert/gigi/dbObjects/Digest.java
index edd8dcad..01b7c541 100644
--- a/src/org/cacert/gigi/dbObjects/Digest.java
+++ b/src/org/cacert/gigi/dbObjects/Digest.java
@@ -16,4 +16,5 @@ public enum Digest {
     public static Digest getDefault() {
         return SHA256;
     }
+
 }
diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java
index 00f51c1f..7e35225f 100644
--- a/src/org/cacert/gigi/dbObjects/Domain.java
+++ b/src/org/cacert/gigi/dbObjects/Domain.java
@@ -69,6 +69,7 @@ public class Domain implements IdCachable, Verifyable {
     private int id;
 
     private static final Set<String> IDNEnabledTLDs;
+
     static {
         Properties CPS = new Properties();
         try (InputStream resourceAsStream = Domain.class.getResourceAsStream("CPS.properties")) {
@@ -261,7 +262,7 @@ public class Domain implements IdCachable, Verifyable {
 
     }
 
-    private static ObjectCache<Domain> myCache = new ObjectCache<>();
+    private static final ObjectCache<Domain> myCache = new ObjectCache<>();
 
     public static synchronized Domain getById(int id) throws IllegalArgumentException {
         Domain em = myCache.get(id);
diff --git a/src/org/cacert/gigi/dbObjects/ObjectCache.java b/src/org/cacert/gigi/dbObjects/ObjectCache.java
index d1e41f82..c17dcacf 100644
--- a/src/org/cacert/gigi/dbObjects/ObjectCache.java
+++ b/src/org/cacert/gigi/dbObjects/ObjectCache.java
@@ -6,9 +6,9 @@ import java.util.HashSet;
 
 public class ObjectCache<T extends IdCachable> {
 
-    private HashMap<Integer, WeakReference<T>> hashmap = new HashMap<>();
+    private final HashMap<Integer, WeakReference<T>> hashmap = new HashMap<>();
 
-    private static HashSet<ObjectCache<?>> caches = new HashSet<>();
+    private static final HashSet<ObjectCache<? extends IdCachable>> caches = new HashSet<>();
 
     protected ObjectCache() {
         caches.add(this);
@@ -27,7 +27,7 @@ public class ObjectCache<T extends IdCachable> {
     }
 
     public static void clearAllCaches() {
-        for (ObjectCache<?> objectCache : caches) {
+        for (ObjectCache<? extends IdCachable> objectCache : caches) {
             objectCache.hashmap.clear();
         }
     }
diff --git a/src/org/cacert/gigi/dbObjects/SupportedUser.java b/src/org/cacert/gigi/dbObjects/SupportedUser.java
index 447825ba..17d7c8cf 100644
--- a/src/org/cacert/gigi/dbObjects/SupportedUser.java
+++ b/src/org/cacert/gigi/dbObjects/SupportedUser.java
@@ -9,7 +9,9 @@ import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
 
 public class SupportedUser {
 
-    private User target, supporter;
+    private User target;
+
+    private User supporter;
 
     private String ticket;
 
diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 42457db5..911d98b7 100644
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -33,7 +33,7 @@ public class User extends CertificateOwner {
 
     private Locale locale;
 
-    private Set<Group> groups = new HashSet<>();
+    private final Set<Group> groups = new HashSet<>();
 
     protected User(GigiResultSet rs) {
         super(rs.getInt("id"));
diff --git a/src/org/cacert/gigi/dbObjects/Verifyable.java b/src/org/cacert/gigi/dbObjects/Verifyable.java
index 68e7173a..e1c997e4 100644
--- a/src/org/cacert/gigi/dbObjects/Verifyable.java
+++ b/src/org/cacert/gigi/dbObjects/Verifyable.java
@@ -5,4 +5,5 @@ import org.cacert.gigi.GigiApiException;
 public interface Verifyable {
 
     public void verify(String hash) throws GigiApiException;
+
 }