UPD: tighten Up the constructors of "User" and "Domain"

diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java
index 056af154173b7ae9616c1f7c0b4eb07528997e4f..8e575038f13989a346427afe2969db766a3c355a 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Domain.java
+++ b/src/org/cacert/gigi/dbObjects/Domain.java
@@ -15,7 +15,7 @@ public class Domain implements IdCachable {
 
     private int id;
 
-    public Domain(int id) throws SQLException {
+    private Domain(int id) throws SQLException {
         PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT memid, domain FROM `domains` WHERE id=? AND deleted IS NULL");
         ps.setInt(1, id);
 

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 9166b0443f4b564bb8f37894c01592ba515e7508..2d8cd96fc0e572f8e4e178b0ccc798cee146a094 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -28,7 +28,7 @@ public class User implements IdCachable {
 
     private Locale locale;
 
-    public User(int id) {
+    private User(int id) {
         this.id = id;
         updateName(id);
     }

diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
index 2ece38d6c8f1ee838bbdee01c8af4bf50cead72f..0a498c587112dcaa34cf0166094889b606c3c728 100644 (file)
--- a/src/org/cacert/gigi/pages/LoginPage.java
+++ b/src/org/cacert/gigi/pages/LoginPage.java
@@ -72,7 +72,7 @@ public class LoginPage extends Page {
             ResultSet rs = ps.executeQuery();
             if (rs.next()) {
                 if (PasswordHash.verifyHash(pw, rs.getString(1))) {
-                    loginSession(req, new User(rs.getInt(2)));
+                    loginSession(req, User.getById(rs.getInt(2)));
                 }
             }
             rs.close();
@@ -92,7 +92,7 @@ public class LoginPage extends Page {
             ps.setString(1, serial);
             ResultSet rs = ps.executeQuery();
             if (rs.next()) {
-                loginSession(req, new User(rs.getInt(1)));
+                loginSession(req, User.getById(rs.getInt(1)));
             }
             rs.close();
         } catch (SQLException e) {

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 3020390d28b9855b8a1fb8985661bf188414bb9e..81743c90214bc306fc8e501dc7eac5d3eac765bd 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -31,9 +31,9 @@ public class AssuranceForm extends Form {
         templ = new Template(AssuranceForm.class.getResource("AssuranceForm.templ"));
     }
 
-    public AssuranceForm(HttpServletRequest hsr, int assuree) {
+    public AssuranceForm(HttpServletRequest hsr, User assuree) {
         super(hsr);
-        this.assuree = new User(assuree);
+        this.assuree = assuree;
         assureeName = this.assuree.getName();
         dob = this.assuree.getDob();
     }

diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index f87afd07543dcbeed8106b3f731e19a3666e53d8..e1822e3beb1dc91cd817fb6de78e7ad710c9562b 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -98,7 +98,7 @@ public class AssurePage extends Page {
                     } else if (getUser(req).getId() == id) {
 
                     } else {
-                        AssuranceForm form = new AssuranceForm(req, id);
+                        AssuranceForm form = new AssuranceForm(req, User.getById(id));
                         outputForm(req, out, form);
                     }
                 }

diff --git a/tests/org/cacert/gigi/TestLanguage.java b/tests/org/cacert/gigi/TestLanguage.java
index d73f1fa2281533635a1ac733e3e7166e026f4d2a..1a97fc3ca231aa0ef112f61953f35999ceb719aa 100644 (file)
--- a/tests/org/cacert/gigi/TestLanguage.java
+++ b/tests/org/cacert/gigi/TestLanguage.java
@@ -19,35 +19,35 @@ public class TestLanguage extends ManagedTest {
 
     @Test
     public void testSignupNoLanguage() {
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         assertEquals(Locale.ENGLISH, u.getPreferredLocale());
     }
 
     @Test
     public void testSignupDE() {
         setAcceptLanguage("de");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         assertEquals(Locale.GERMAN, u.getPreferredLocale());
     }
 
     @Test
     public void testSignupMulti() {
         setAcceptLanguage("de,en");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         assertEquals(Locale.GERMAN, u.getPreferredLocale());
     }
 
     @Test
     public void testSignupFallback() {
         setAcceptLanguage("ma,de");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         assertEquals(Locale.GERMAN, u.getPreferredLocale());
     }
 
     @Test
     public void testSignupProjection() {
         setAcceptLanguage("de-de,en");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         assertEquals(Locale.GERMAN, u.getPreferredLocale());
     }
 
@@ -66,7 +66,7 @@ public class TestLanguage extends ManagedTest {
     @Test
     public void testLanguageAfterLogin() throws IOException {
         setAcceptLanguage("de,en");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         String cookie = login(u.getEmail(), TEST_PASSWORD);
         String content = IOUtils.readURL(cookie(new URL("https://" + getServerName() + "/").openConnection(), cookie));
         assertThat(content, containsString(Language.getInstance(Locale.GERMAN).getTranslation("Translations")));
@@ -75,7 +75,7 @@ public class TestLanguage extends ManagedTest {
     @Test
     public void testOtherLanguageAfterLogin() throws IOException {
         setAcceptLanguage("fr,de,en");
-        User u = new User(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User u = User.getById(createVerifiedUser("fname", "lname", createUniqueName() + "@example.org", TEST_PASSWORD));
         String cookie = login(u.getEmail(), TEST_PASSWORD);
         String content = IOUtils.readURL(cookie(new URL("https://" + getServerName() + "/").openConnection(), cookie));
         assertThat(content, containsString(Language.getInstance(Locale.FRENCH).getTranslation("Translations")));

diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java
index 9e4a115cc1398158672155e615db44f94467f6f9..379f35473cc03abf1a4cf48f06ba4f12ab214dde 100644 (file)
--- a/tests/org/cacert/gigi/TestUser.java
+++ b/tests/org/cacert/gigi/TestUser.java
@@ -28,7 +28,7 @@ public class TestUser extends ManagedTest {
         u.setEmail(createUniqueName() + "a@email.org");
         u.insert("password");
         int id = u.getId();
-        User u2 = new User(id);
+        User u2 = User.getById(id);
         assertEquals(u, u2);
     }
 
@@ -36,7 +36,7 @@ public class TestUser extends ManagedTest {
     public void testWebStoreAndLoad() throws SQLException {
         int id = createVerifiedUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD);
 
-        User u = new User(id);
+        User u = User.getById(id);
         assertEquals("aä", u.getFname());
         assertEquals("b", u.getLname());
         assertEquals("", u.getMname());
@@ -46,7 +46,7 @@ public class TestUser extends ManagedTest {
     public void testAssurerUtilMethods() throws SQLException {
         int id = createAssuranceUser("aä", "b", createUniqueName() + "a@email.org", TEST_PASSWORD);
 
-        User u = new User(id);
+        User u = User.getById(id);
         assertTrue(u.canAssure());
         int assurancePoints = u.getAssurancePoints();
         int expPoints = u.getExperiencePoints();
@@ -65,7 +65,7 @@ public class TestUser extends ManagedTest {
         String uq = createUniqueName();
         int id = createVerifiedUser("aä", "b", uq + "a@email.org", TEST_PASSWORD);
 
-        User u = new User(id);
+        User u = User.getById(id);
         new EmailAddress(uq + "b@email.org", u).insert(Language.getInstance(Locale.ENGLISH));
         new EmailAddress(uq + "c@email.org", u).insert(Language.getInstance(Locale.ENGLISH));
         new Domain(u, uq + "a.testdomain.org").insert();

diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java
index 03aa60a6427f7283324ba66561ce67600fadbbf2..36cd5c12424c7076cb76c0a96eccd2e687170d5e 100644 (file)
--- a/tests/org/cacert/gigi/util/TestNotary.java
+++ b/tests/org/cacert/gigi/util/TestNotary.java
@@ -20,9 +20,9 @@ public class TestNotary extends ManagedTest {
         User[] users = new User[30];
         for (int i = 0; i < users.length; i++) {
             int id = createVerifiedUser("fn" + i, "ln" + i, createUniqueName() + "@email.org", TEST_PASSWORD);
-            users[i] = new User(id);
+            users[i] = User.getById(id);
         }
-        User assurer = new User(createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD));
+        User assurer = User.getById(createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD));
         int[] result = new int[] {
                 10, 10, 10, 10, 15, 15, 15, 15, 15, 20, 20, 20, 20, 20, 25, 25, 25, 25, 25, 30, 30, 30, 30, 30, 35, 35, 35, 35, 35, 35
         };
@@ -61,13 +61,13 @@ public class TestNotary extends ManagedTest {
         User[] users = new User[30];
         for (int i = 0; i < users.length; i++) {
             int id = createVerifiedUser("fn" + i, "ln" + i, createUniqueName() + "@email.org", TEST_PASSWORD);
-            users[i] = new User(id);
+            users[i] = User.getById(id);
         }
         int id = createAssuranceUser("fn", "ln", createUniqueName() + "@email.org", TEST_PASSWORD);
         PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE users SET dob=NOW() WHERE id=?");
         ps.setInt(1, id);
         ps.execute();
-        User assurer = new User(id);
+        User assurer = User.getById(id);
         for (int i = 0; i < users.length; i++) {
             assuranceFail(assurer, users[i], -1, "test-notary", "2014-01-01");
             assuranceFail(assurer, users[i], 11, "test-notary", "2014-01-01");
@@ -78,8 +78,8 @@ public class TestNotary extends ManagedTest {
 
     @Test
     public void testFail() throws SQLException, GigiApiException {
-        User assuranceUser = new User(createAssuranceUser("fn", "ln", createUniqueName() + "@example.org", TEST_PASSWORD));
-        User assuree = new User(createVerifiedUser("fn", "ln", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User assuranceUser = User.getById(createAssuranceUser("fn", "ln", createUniqueName() + "@example.org", TEST_PASSWORD));
+        User assuree = User.getById(createVerifiedUser("fn", "ln", createUniqueName() + "@example.org", TEST_PASSWORD));
 
         // invalid date format
         assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", "2014-01-blah");