Upgrade SDC from Titan to Janus Graph

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / filters / BeServletFilter.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java
index 3a823de..c943010 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java
@@ -25,7 +25,7 @@ import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.Configuration;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.dao.jsongraph.HealingTitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.HealingJanusGraphDao;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.common.api.Constants;
@@ -118,7 +118,7 @@ public class BeServletFilter implements ContainerRequestFilter, ContainerRespons
                 audit.startLog(requestContext);
             }
 
-            writeToTitan(responseContext);
+            writeToJanusGraph(responseContext);
 
             //write to Audit log in case it's valuable action
             // (e.g. ignoring healthCheck and any other unlogged urls as in yaml
@@ -144,18 +144,18 @@ public class BeServletFilter implements ContainerRequestFilter, ContainerRespons
         }
     }
 
-    private void writeToTitan(ContainerResponseContext responseContext) {
+    private void writeToJanusGraph(ContainerResponseContext responseContext) {
         log.debug("Close transaction from filter");
-        HealingTitanDao titanDao = getTitanDao();
-        if (titanDao != null) {
+        HealingJanusGraphDao janusGraphDao = getJanusGraphDao();
+        if (janusGraphDao != null) {
             int status = responseContext.getStatus();
             if (status == Response.Status.OK.getStatusCode() ||
                     status == Response.Status.CREATED.getStatusCode() ||
                     status == Response.Status.NO_CONTENT.getStatusCode()) {
-                titanDao.commit();
+                janusGraphDao.commit();
                 log.debug("Doing commit from filter");
             } else {
-                titanDao.rollback();
+                janusGraphDao.rollback();
                 log.debug("Doing rollback from filter");
             }
         }
@@ -202,12 +202,12 @@ public class BeServletFilter implements ContainerRequestFilter, ContainerRespons
         return webApplicationContext.getBean(ComponentsUtils.class);
     }
 
-    private HealingTitanDao getTitanDao() {
+    private HealingJanusGraphDao getJanusGraphDao() {
         ServletContext context = this.sr.getSession().getServletContext();
 
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        return webApplicationContext.getBean(HealingTitanDao.class);
+        return webApplicationContext.getBean(HealingJanusGraphDao.class);
     }
 
     // Extracted for purpose of clear method name, for logback %M parameter