From 516dee3492c29cc23f2dc394231e3f121bfb6c72 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 18 Mar 2012 15:24:35 +0100
Subject: [PATCH] use converter createShema method of converter objects

---
 .../scm/group/orientdb/OrientDBGroupDAO.java  | 22 ----------------
 .../orientdb/AbstractOrientDBModelDAO.java    | 21 ++++++++++++++++
 .../orientdb/OrientDBRepositoryDAO.java       | 25 -------------------
 .../scm/user/orientdb/OrientDBUserDAO.java    | 21 ----------------
 4 files changed, 21 insertions(+), 68 deletions(-)

diff --git a/scm-dao-orientdb/src/main/java/sonia/scm/group/orientdb/OrientDBGroupDAO.java b/scm-dao-orientdb/src/main/java/sonia/scm/group/orientdb/OrientDBGroupDAO.java
index efb558a26c..27ef047505 100644
--- a/scm-dao-orientdb/src/main/java/sonia/scm/group/orientdb/OrientDBGroupDAO.java
+++ b/scm-dao-orientdb/src/main/java/sonia/scm/group/orientdb/OrientDBGroupDAO.java
@@ -43,7 +43,6 @@ import sonia.scm.group.Group;
 import sonia.scm.group.GroupDAO;
 import sonia.scm.orientdb.AbstractOrientDBModelDAO;
 import sonia.scm.orientdb.OrientDBUtil;
-import sonia.scm.user.orientdb.UserConverter;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -76,7 +75,6 @@ public class OrientDBGroupDAO extends AbstractOrientDBModelDAO<Group>
   public OrientDBGroupDAO(Provider<ODatabaseDocumentTx> connectionProvider)
   {
     super(connectionProvider, GroupConverter.INSTANCE);
-    init();
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -110,24 +108,4 @@ public class OrientDBGroupDAO extends AbstractOrientDBModelDAO<Group>
     return OrientDBUtil.executeSingleResultQuery(connection, QUERY_SINGLE_BYID,
             id);
   }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  private void init()
-  {
-    ODatabaseDocumentTx connection = connectionProvider.get();
-
-    try
-    {
-      UserConverter.INSTANCE.createShema(connection);
-    }
-    finally
-    {
-      OrientDBUtil.close(connection);
-    }
-  }
 }
diff --git a/scm-dao-orientdb/src/main/java/sonia/scm/orientdb/AbstractOrientDBModelDAO.java b/scm-dao-orientdb/src/main/java/sonia/scm/orientdb/AbstractOrientDBModelDAO.java
index 92d28d7856..a4049f16af 100644
--- a/scm-dao-orientdb/src/main/java/sonia/scm/orientdb/AbstractOrientDBModelDAO.java
+++ b/scm-dao-orientdb/src/main/java/sonia/scm/orientdb/AbstractOrientDBModelDAO.java
@@ -75,6 +75,7 @@ public abstract class AbstractOrientDBModelDAO<T extends ModelObject>
   {
     this.connectionProvider = connectionProvider;
     this.converter = converter;
+    createShema();
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -317,6 +318,26 @@ public abstract class AbstractOrientDBModelDAO<T extends ModelObject>
     return TYPE;
   }
 
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   */
+  private void createShema()
+  {
+    ODatabaseDocumentTx connection = connectionProvider.get();
+
+    try
+    {
+      converter.createShema(connection);
+    }
+    finally
+    {
+      OrientDBUtil.close(connection);
+    }
+  }
+
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
diff --git a/scm-dao-orientdb/src/main/java/sonia/scm/repository/orientdb/OrientDBRepositoryDAO.java b/scm-dao-orientdb/src/main/java/sonia/scm/repository/orientdb/OrientDBRepositoryDAO.java
index 02870e17d5..7288c0af57 100644
--- a/scm-dao-orientdb/src/main/java/sonia/scm/repository/orientdb/OrientDBRepositoryDAO.java
+++ b/scm-dao-orientdb/src/main/java/sonia/scm/repository/orientdb/OrientDBRepositoryDAO.java
@@ -79,7 +79,6 @@ public class OrientDBRepositoryDAO extends AbstractOrientDBModelDAO<Repository>
   public OrientDBRepositoryDAO(Provider<ODatabaseDocumentTx> connectionProvider)
   {
     super(connectionProvider, RepositoryConverter.INSTANCE);
-    init();
   }
 
   //~--- methods --------------------------------------------------------------
@@ -163,30 +162,6 @@ public class OrientDBRepositoryDAO extends AbstractOrientDBModelDAO<Repository>
             id);
   }
 
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   */
-  private void init()
-  {
-    ODatabaseDocumentTx connection = connectionProvider.get();
-
-    try
-    {
-      RepositoryConverter.INSTANCE.createShema(connection);
-      PermissionConverter.INSTANCE.createShema(connection);
-    }
-    finally
-    {
-      OrientDBUtil.close(connection);
-    }
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
   /**
    * Method description
    *
diff --git a/scm-dao-orientdb/src/main/java/sonia/scm/user/orientdb/OrientDBUserDAO.java b/scm-dao-orientdb/src/main/java/sonia/scm/user/orientdb/OrientDBUserDAO.java
index da461a062b..e68c980ca6 100644
--- a/scm-dao-orientdb/src/main/java/sonia/scm/user/orientdb/OrientDBUserDAO.java
+++ b/scm-dao-orientdb/src/main/java/sonia/scm/user/orientdb/OrientDBUserDAO.java
@@ -75,7 +75,6 @@ public class OrientDBUserDAO extends AbstractOrientDBModelDAO<User>
   public OrientDBUserDAO(Provider<ODatabaseDocumentTx> connectionProvider)
   {
     super(connectionProvider, UserConverter.INSTANCE);
-    init();
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -109,24 +108,4 @@ public class OrientDBUserDAO extends AbstractOrientDBModelDAO<User>
     return OrientDBUtil.executeSingleResultQuery(connection, QUERY_SINGLE_BYID,
             id);
   }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  private void init()
-  {
-    ODatabaseDocumentTx connection = connectionProvider.get();
-
-    try
-    {
-      UserConverter.INSTANCE.createShema(connection);
-    }
-    finally
-    {
-      OrientDBUtil.close(connection);
-    }
-  }
 }