Merge "Reorder modifiers"

[so.git] / bpmn / MSOURN-plugin / src / main / java / org / openecomp / camunda / bpmn / plugin / urnmap / db / MyBatisExtendedSessionFactory.java

diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisExtendedSessionFactory.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisExtendedSessionFactory.java
index 60d6566..9e43ee3 100644 (file)
--- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisExtendedSessionFactory.java
+++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/db/MyBatisExtendedSessionFactory.java
@@ -37,7 +37,6 @@ public class MyBatisExtendedSessionFactory extends StandaloneProcessEngineConfig
 \r
   private String resourceName;\r
 \r
-  @Override\r
   protected void init() {\r
     throw new IllegalArgumentException(\r
             "Normal 'init' on process engine only used for extended MyBatis mappings is not allowed, please use 'initFromProcessEngineConfiguration'. You cannot construct a process engine with this configuration.");\r
@@ -56,6 +55,7 @@ public class MyBatisExtendedSessionFactory extends StandaloneProcessEngineConfig
     setDatabaseTablePrefix(processEngineConfiguration.getDatabaseTablePrefix());\r
 \r
     initDataSource();\r
+    //initVariableTypes();\r
     initCommandContextFactory();\r
     initTransactionFactory();\r
     initTransactionContextFactory();\r
@@ -75,7 +75,7 @@ public class MyBatisExtendedSessionFactory extends StandaloneProcessEngineConfig
    */\r
   @Override\r
   protected Collection<? extends CommandInterceptor> getDefaultCommandInterceptorsTxRequired() {\r
-    List<CommandInterceptor> defaultCommandInterceptorsTxRequired = new ArrayList<>();\r
+    List<CommandInterceptor> defaultCommandInterceptorsTxRequired = new ArrayList<CommandInterceptor>();\r
     defaultCommandInterceptorsTxRequired.add(new LogInterceptor());\r
     defaultCommandInterceptorsTxRequired.add(new CommandContextInterceptor(commandContextFactory, this, true));\r
     return defaultCommandInterceptorsTxRequired;\r