From 787dc5faad7c6829b0e9b699767fc6e13c17999e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 22 Oct 2015 14:08:12 +0200
Subject: [PATCH] refactor: move job to dbObjects Package

---
 src/org/cacert/gigi/api/GigiAPI.java                           | 2 +-
 src/org/cacert/gigi/dbObjects/Certificate.java                 | 1 -
 src/org/cacert/gigi/{util => dbObjects}/Job.java               | 3 +--
 .../gigi/pages/account/certs/CertificateModificationForm.java  | 2 +-
 tests/org/cacert/gigi/TestSeparateSessionScope.java            | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename src/org/cacert/gigi/{util => dbObjects}/Job.java (96%)

diff --git a/src/org/cacert/gigi/api/GigiAPI.java b/src/org/cacert/gigi/api/GigiAPI.java
index 744432f4..3af4714c 100644
--- a/src/org/cacert/gigi/api/GigiAPI.java
+++ b/src/org/cacert/gigi/api/GigiAPI.java
@@ -13,11 +13,11 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.Job;
 import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.account.certs.CertificateRequest;
-import org.cacert.gigi.util.Job;
 import org.cacert.gigi.util.PEM;
 
 public class GigiAPI extends HttpServlet {
diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
index 7cbdeb59..4d672572 100644
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -20,7 +20,6 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
-import org.cacert.gigi.util.Job;
 import org.cacert.gigi.util.KeyStorage;
 import org.cacert.gigi.util.Notary;
 
diff --git a/src/org/cacert/gigi/util/Job.java b/src/org/cacert/gigi/dbObjects/Job.java
similarity index 96%
rename from src/org/cacert/gigi/util/Job.java
rename to src/org/cacert/gigi/dbObjects/Job.java
index e6f50140..321b89d0 100644
--- a/src/org/cacert/gigi/util/Job.java
+++ b/src/org/cacert/gigi/dbObjects/Job.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package org.cacert.gigi.dbObjects;
 
 import java.sql.Date;
 
@@ -6,7 +6,6 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
-import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.output.CertificateValiditySelector;
 
 public class Job {
diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java b/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java
index 14e6c2fb..8449c20f 100644
--- a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java
@@ -7,13 +7,13 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.Job;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.CertificateIterable;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
-import org.cacert.gigi.util.Job;
 
 public class CertificateModificationForm extends Form {
 
diff --git a/tests/org/cacert/gigi/TestSeparateSessionScope.java b/tests/org/cacert/gigi/TestSeparateSessionScope.java
index 66688ebd..c82f8e07 100644
--- a/tests/org/cacert/gigi/TestSeparateSessionScope.java
+++ b/tests/org/cacert/gigi/TestSeparateSessionScope.java
@@ -16,9 +16,9 @@ import java.sql.SQLException;
 import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.dbObjects.Certificate.CSRType;
 import org.cacert.gigi.dbObjects.CertificateProfile;
+import org.cacert.gigi.dbObjects.Job;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.ManagedTest;
-import org.cacert.gigi.util.Job;
 import org.junit.Test;
 
 public class TestSeparateSessionScope extends ManagedTest {
-- 
2.39.2