Empty: Whitespace, serialVersionUID, final classes

diff --git a/src/org/cacert/gigi/DevelLauncher.java b/src/org/cacert/gigi/DevelLauncher.java
index 431b922d298b76137884029b7b04e651db775079..e66b9157cd7b07cf3d91e04192b41f96219ba520 100644 (file)
--- a/src/org/cacert/gigi/DevelLauncher.java
+++ b/src/org/cacert/gigi/DevelLauncher.java
@@ -92,7 +92,9 @@ public class DevelLauncher {
                 public boolean needsLogin() {
                     return false;
                 }
                 public boolean needsLogin() {
                     return false;
                 }

+

             });
             });

+

             pages.put("/kill", new Page("Kill") {
 
                 @Override
             pages.put("/kill", new Page("Kill") {
 
                 @Override


@@ -105,6 +107,7 @@ public class DevelLauncher {
                     return false;
                 }
             });
                     return false;
                 }
             });

+

             pageF.set(gigi, Collections.unmodifiableMap(pages));
         } catch (ReflectiveOperationException e) {
             e.printStackTrace();
             pageF.set(gigi, Collections.unmodifiableMap(pages));
         } catch (ReflectiveOperationException e) {
             e.printStackTrace();

diff --git a/src/org/cacert/gigi/GigiApiException.java b/src/org/cacert/gigi/GigiApiException.java
index b858e7d9a35d662c5ecefc10375d9a798d33349b..944fe645ece5618fb2dc93afc5318d164be6c84b 100644 (file)
--- a/src/org/cacert/gigi/GigiApiException.java
+++ b/src/org/cacert/gigi/GigiApiException.java
@@ -13,6 +13,8 @@ import org.cacert.gigi.output.template.TranslateCommand;
 
 public class GigiApiException extends Exception {
 
 
 public class GigiApiException extends Exception {
 

+    private static final long serialVersionUID = -164928670180852588L;
+

     private SQLException e;
 
     private LinkedList<Outputable> messages = new LinkedList<>();
     private SQLException e;
 
     private LinkedList<Outputable> messages = new LinkedList<>();

diff --git a/src/org/cacert/gigi/api/GigiAPI.java b/src/org/cacert/gigi/api/GigiAPI.java
index ae8aee350efa70dc7837aabaa9685aeaeab755b1..744432f43fd7a1b02d4a7bbef561a89b43e85720 100644 (file)
--- a/src/org/cacert/gigi/api/GigiAPI.java
+++ b/src/org/cacert/gigi/api/GigiAPI.java
@@ -22,6 +22,8 @@ import org.cacert.gigi.util.PEM;
 
 public class GigiAPI extends HttpServlet {
 
 
 public class GigiAPI extends HttpServlet {
 

+    private static final long serialVersionUID = 659963677032635817L;
+

     @Override
     protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         String pi = req.getPathInfo();
     @Override
     protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         String pi = req.getPathInfo();

diff --git a/src/org/cacert/gigi/dbObjects/CertificateOwner.java b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
index 82143db50030301a04ae6da8bdadd45b8d0f01a1..9719439858f558c26987a68b3bfaa8ca2f661169 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/CertificateOwner.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
@@ -6,6 +6,8 @@ import org.cacert.gigi.database.GigiResultSet;
 
 public abstract class CertificateOwner implements IdCachable {
 
 
 public abstract class CertificateOwner implements IdCachable {
 

+    private static ObjectCache<CertificateOwner> myCache = new ObjectCache<>();
+

     private int id;
 
     public CertificateOwner(int id) {
     private int id;
 
     public CertificateOwner(int id) {


@@ -18,8 +20,6 @@ public abstract class CertificateOwner implements IdCachable {
         return id;
     }
 
         return id;
     }
 

-    private static ObjectCache<CertificateOwner> myCache = new ObjectCache<>();
-

     public static synchronized CertificateOwner getById(int id) {
         CertificateOwner u = myCache.get(id);
         if (u == null) {
     public static synchronized CertificateOwner getById(int id) {
         CertificateOwner u = myCache.get(id);
         if (u == null) {


@@ -122,6 +122,7 @@ public abstract class CertificateOwner implements IdCachable {
                 return true;
             }
         }
                 return true;
             }
         }

+

         return false;
     }
 
         return false;
     }
 


@@ -131,6 +132,7 @@ public abstract class CertificateOwner implements IdCachable {
                 return true;
             }
         }
                 return true;
             }
         }

+

         return false;
     }
 
         return false;
     }
 


@@ -140,4 +142,5 @@ public abstract class CertificateOwner implements IdCachable {
         ps.execute();
         myCache.remove(this);
     }
         ps.execute();
         myCache.remove(this);
     }

+

 }
 }

diff --git a/src/org/cacert/gigi/dbObjects/IdCachable.java b/src/org/cacert/gigi/dbObjects/IdCachable.java
index cc083d2592c152b8abe7112d6fc48ee8a68227c9..af439bcfb910cf3ddc02e2ea44e43dea88a9ad28 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/IdCachable.java
+++ b/src/org/cacert/gigi/dbObjects/IdCachable.java
@@ -3,4 +3,5 @@ package org.cacert.gigi.dbObjects;
 public interface IdCachable {
 
     public int getId();
 public interface IdCachable {
 
     public int getId();

+

 }
 }

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 9b2cf515c5c2b200e8520a8b2c11107be1f839fb..a370d61a7a261ab8dfe2b90d07efc03b92c36ad9 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -42,12 +42,14 @@ public class User extends CertificateOwner {
         name = new Name(rs.getString("fname"), rs.getString("lname"), rs.getString("mname"), rs.getString("suffix"));
         dob = rs.getDate("dob");
         email = rs.getString("email");
         name = new Name(rs.getString("fname"), rs.getString("lname"), rs.getString("mname"), rs.getString("suffix"));
         dob = rs.getDate("dob");
         email = rs.getString("email");

+

         String localeStr = rs.getString("language");
         if (localeStr == null || localeStr.equals("")) {
             locale = Locale.getDefault();
         } else {
             locale = Language.getLocaleFromString(localeStr);
         }
         String localeStr = rs.getString("language");
         if (localeStr == null || localeStr.equals("")) {
             locale = Locale.getDefault();
         } else {
             locale = Language.getLocaleFromString(localeStr);
         }

+

         GigiPreparedStatement psg = DatabaseConnection.getInstance().prepare("SELECT permission FROM user_groups WHERE user=? AND deleted is NULL");
         psg.setInt(1, rs.getInt("id"));
         GigiResultSet rs2 = psg.executeQuery();
         GigiPreparedStatement psg = DatabaseConnection.getInstance().prepare("SELECT permission FROM user_groups WHERE user=? AND deleted is NULL");
         psg.setInt(1, rs.getInt("id"));
         GigiResultSet rs2 = psg.executeQuery();


@@ -224,6 +226,7 @@ public class User extends CertificateOwner {
         if (exp >= 50) {
             points += 5;
         }
         if (exp >= 50) {
             points += 5;
         }

+

         return points;
     }
 
         return points;
     }
 


@@ -421,6 +424,7 @@ public class User extends CertificateOwner {
         if (co instanceof User) {
             return (User) co;
         }
         if (co instanceof User) {
             return (User) co;
         }

+

         return null;
     }
 
         return null;
     }
 

diff --git a/src/org/cacert/gigi/output/template/Form.java b/src/org/cacert/gigi/output/template/Form.java
index f330fe865a9e36e42ff874528338db347cdb1ea9..ed1a86689cd261b95aa03807e56eb40d8dd11f29 100644 (file)
--- a/src/org/cacert/gigi/output/template/Form.java
+++ b/src/org/cacert/gigi/output/template/Form.java
@@ -109,5 +109,7 @@ public abstract class Form implements Outputable {
 
     public static class CSRFException extends IOException {
 
 
     public static class CSRFException extends IOException {
 

+        private static final long serialVersionUID = 59708247477988362L;
+

     }
 }
     }
 }

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 4ac5d910f3d9ba78f3a2f1f65a33c0ff35b784de..6564a5fdbaabbc693636631dfce828fdbad3cd89 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -286,12 +286,14 @@ public class ManagedTest extends ConfiguredTest {
             TestMail tm = ter.recieve();
             Assert.assertNotNull(tm);
             tm.verify();
             TestMail tm = ter.recieve();
             Assert.assertNotNull(tm);
             tm.verify();

+

             GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?");
             ps.setString(1, email);
             GigiResultSet rs = ps.executeQuery();
             if (rs.next()) {
                 return rs.getInt(1);
             }
             GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id FROM users where email=?");
             ps.setString(1, email);
             GigiResultSet rs = ps.executeQuery();
             if (rs.next()) {
                 return rs.getInt(1);
             }

+

             throw new Error();
         } catch (InterruptedException e) {
             throw new Error(e);
             throw new Error();
         } catch (InterruptedException e) {
             throw new Error(e);

diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
index b47133b7da2039f1ff8e9b852ec4112f9248c51e..dc90acde7ca02bd9f354e17c3fb333c334375732 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
+++ b/tests/org/cacert/gigi/testUtils/TestEmailReciever.java
@@ -14,7 +14,7 @@ import java.util.regex.Pattern;
 
 import org.cacert.gigi.email.EmailProvider;
 
 
 import org.cacert.gigi.email.EmailProvider;
 

-public class TestEmailReciever extends EmailProvider implements Runnable {
+public final class TestEmailReciever extends EmailProvider implements Runnable {

 
     public class TestMail {
 
 
     public class TestMail {