From eb240c751a46dade6be64a0e8764b58c99c93078 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 22 Oct 2021 20:07:50 +0200
Subject: [PATCH] Cleaned code

---
 .../dbinitialization/DatabaseEnvironment.java     | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java
index 4667849..3f9603a 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java
@@ -182,25 +182,18 @@ public class DatabaseEnvironment {
 		try {
 			boolean created = initGraphDB();
 			
-			AdminSecurityContext adminSecurityContext = AdminSecurityContext.getInstance();
-			
-			QueryTemplatesSecurityContext queryTemplatesSecurityContext = QueryTemplatesSecurityContext.getInstance();
-			TypeSecurityContext typeSecurityContext = TypeSecurityContext.getInstance();
-			ContextSecurityContext contextSecurityContext = ContextSecurityContext.getInstance();
-			
 			if(created) {
 				ODatabasePool pool = new ODatabasePool(DatabaseEnvironment.DB_URI, CHANGED_ADMIN_USERNAME,
 						CHANGED_ADMIN_PASSWORD);
 				ODatabaseDocument oDatabaseDocument = pool.acquire();
-				adminSecurityContext.create(oDatabaseDocument);
+				AdminSecurityContext.getInstance().create(oDatabaseDocument);
 				oDatabaseDocument.commit();
 				oDatabaseDocument.close();
 				pool.close();
 				
-				queryTemplatesSecurityContext.create();
-				typeSecurityContext.create();
-				contextSecurityContext.create();
-				
+				QueryTemplatesSecurityContext.getInstance().create();
+				TypeSecurityContext.getInstance().create();
+				ContextSecurityContext.getInstance().create();
 				
 				List<Class<? extends Element>> definitionToBeCreated = new ArrayList<>();
 				definitionToBeCreated.add(PropertyElement.class);