From 9b41d508475d91353afaecfb30d88820a4fa7f59 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 18 Mar 2012 14:53:01 +0100
Subject: [PATCH] improve schema creation for user class

---
 .../scm/user/orientdb/OrientDBUserDAO.java    | 47 ++++++++-----------
 .../scm/user/orientdb/UserConverter.java      |  4 --
 2 files changed, 20 insertions(+), 31 deletions(-)

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 871fdb74e3..5cdd3895a5 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
@@ -42,7 +42,6 @@ import com.orientechnologies.orient.core.record.impl.ODocument;
 
 import sonia.scm.orientdb.AbstractOrientDBModelDAO;
 import sonia.scm.orientdb.OrientDBUtil;
-import sonia.scm.repository.orientdb.RepositoryConverter;
 import sonia.scm.user.User;
 import sonia.scm.user.UserDAO;
 
@@ -79,32 +78,6 @@ public class OrientDBUserDAO extends AbstractOrientDBModelDAO<User>
     init();
   }
 
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  public void init()
-  {
-    ODatabaseDocumentTx connection = connectionProvider.get();
-
-    try
-    {
-      OSchema schema = connection.getMetadata().getSchema();
-      OClass oclass = schema.getClass(UserConverter.DOCUMENT_CLASS);
-
-      if (oclass == null)
-      {
-        UserConverter.INSTANCE.createShema(connection);
-      }
-    }
-    finally
-    {
-      OrientDBUtil.close(connection);
-    }
-  }
-
   //~--- get methods ----------------------------------------------------------
 
   /**
@@ -136,4 +109,24 @@ 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);
+    }
+  }
 }
diff --git a/scm-dao-orientdb/src/main/java/sonia/scm/user/orientdb/UserConverter.java b/scm-dao-orientdb/src/main/java/sonia/scm/user/orientdb/UserConverter.java
index 2815023d37..e0fbea3ef4 100644
--- a/scm-dao-orientdb/src/main/java/sonia/scm/user/orientdb/UserConverter.java
+++ b/scm-dao-orientdb/src/main/java/sonia/scm/user/orientdb/UserConverter.java
@@ -35,16 +35,12 @@ package sonia.scm.user.orientdb;
 
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
-import com.orientechnologies.orient.core.metadata.schema.OClass.INDEX_TYPE;
 import com.orientechnologies.orient.core.metadata.schema.OSchema;
 import com.orientechnologies.orient.core.metadata.schema.OType;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 
 import sonia.scm.orientdb.AbstractConverter;
 import sonia.scm.orientdb.Converter;
-import sonia.scm.orientdb.OrientDBUtil;
-import sonia.scm.repository.orientdb.PermissionConverter;
-import sonia.scm.repository.orientdb.RepositoryConverter;
 import sonia.scm.user.User;
 
 /**