From 91de348df8fc3ffe9960fcc01752e1a0b2d5e3ac Mon Sep 17 00:00:00 2001
From: tosmers <tosmers@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 23 Jan 2017 18:10:26 +0000
Subject: [PATCH] [UPDATE] - adds @Inject-statements for marshaller-objects to
 ImportHelper.class

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4532 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 4adfd0c7d3940c30c3bb9be0410f58e6848693b0
---
 .../security/GroupMembershipMarshaller.java   |  4 +
 .../portation/CoreDataImportTest.java         | 27 ++++---
 .../org/libreccm/portation/ImportHelper.java  | 78 ++++++++++---------
 3 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java
index 7c98a7335..0b8c76c80 100644
--- a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java
+++ b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java
@@ -19,7 +19,9 @@
 package org.libreccm.security;
 
 import org.libreccm.portation.AbstractMarshaller;
+import org.libreccm.portation.Marshals;
 
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.transaction.Transactional;
@@ -28,6 +30,8 @@ import javax.transaction.Transactional;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 11/7/16
  */
+@RequestScoped
+@Marshals(GroupMembership.class)
 public class GroupMembershipMarshaller extends AbstractMarshaller<GroupMembership> {
 
     @Inject
diff --git a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
index 2d2fa6c59..2d6ad9074 100644
--- a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
+++ b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
@@ -53,6 +53,8 @@ import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies;
 @CreateSchema({"create_ccm_core_schema.sql"})
 public class CoreDataImportTest {
 
+    private ImportHelper importHelper;
+
     public CoreDataImportTest() {
 
     }
@@ -106,6 +108,7 @@ public class CoreDataImportTest {
 
     @Before
     public void setUp() {
+        importHelper = new ImportHelper();
     }
 
     @After
@@ -117,73 +120,73 @@ public class CoreDataImportTest {
     @Test
     @InSequence(105)
     public void categoriesShouldBeImported() {
-        ImportHelper.importCategories();
+        importHelper.importCategories();
     }
 
     @Test
     @InSequence(110)
     public void categorizationsShouldBeImported() {
-        ImportHelper.importCategorizations();
+        importHelper.importCategorizations();
     }
 
     @Test
     @InSequence(115)
     public void usersShouldBeImported() {
-        ImportHelper.importUsers();
+        importHelper.importUsers();
     }
 
     @Test
     @InSequence(120)
     public void groupsShouldBeImported() {
-        ImportHelper.importGroups();
+        importHelper.importGroups();
     }
 
     @Test
     @InSequence(125)
     public void groupMembershipsShouldBeImported() {
-        ImportHelper.importGroupMemberships();
+        importHelper.importGroupMemberships();
     }
 
     @Test
     @InSequence(130)
     public void rolesShouldBeImported() {
-        ImportHelper.importRoles();
+        importHelper.importRoles();
     }
 
     @Test
     @InSequence(135)
     public void roleMembershipsShouldBeImported() {
-        ImportHelper.importRoleMemberships();
+        importHelper.importRoleMemberships();
     }
 
     @Test
     @InSequence(140)
     public void workflowTemplatesShouldBeImported() {
-        ImportHelper.importWorkflowTemplates();
+        importHelper.importWorkflowTemplates();
     }
 
     @Test
     @InSequence(145)
     public void workflowsShouldBeImported() {
-        ImportHelper.importWorkflows();
+        importHelper.importWorkflows();
     }
 
     @Test
     @InSequence(150)
     public void assignableTasksShouldBeImported() {
-        ImportHelper.importAssignableTasks();
+        importHelper.importAssignableTasks();
     }
 
     @Test
     @InSequence(155)
     public void taskAssignmentsShouldBeImported() {
-        ImportHelper.importTaskAssignments();
+        importHelper.importTaskAssignments();
     }
 
     @Test
     @InSequence(160)
     public void permissionsShouldBeImported() {
-        ImportHelper.importPermissions();
+        importHelper.importPermissions();
     }
 
 
diff --git a/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java b/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java
index 8e72d0a6f..5366c9455 100644
--- a/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java
+++ b/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java
@@ -32,6 +32,8 @@ import org.libreccm.workflow.TaskAssignmentMarshaller;
 import org.libreccm.workflow.WorkflowMarshaller;
 import org.libreccm.workflow.WorkflowTemplateMarshaller;
 
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import java.util.List;
 
 /**
@@ -41,101 +43,107 @@ import java.util.List;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 12/1/16
  */
+@RequestScoped
 class ImportHelper {
-    private static String pathName =
+    private String pathName =
             "/home/tosmers/Svn/libreccm/ccm_ng/ccm-core/src/test/resources/" +
                     "portation/trunk-iaw-exports";
-    private static boolean indentation = false;
+    private boolean indentation = false;
+
+    @Inject
+    private CategoryMarshaller categoryMarshaller;
+    @Inject
+    private CategorizationMarshaller categorizationMarshaller;
+    @Inject
+    private UserMarshaller userMarshaller;
+    @Inject
+    private GroupMarshaller groupMarshaller;
+    @Inject
+    private GroupMembershipMarshaller groupMembershipMarshaller;
+    @Inject
+    private RoleMarshaller roleMarshaller;
+    @Inject
+    private RoleMembershipMarshaller roleMembershipMarshaller;
+    @Inject
+    private WorkflowTemplateMarshaller workflowTemplateMarshaller;
+    @Inject
+    private WorkflowMarshaller workflowMarshaller;
+    @Inject
+    private AssignableTaskMarshaller assignableTaskMarshaller;
+    @Inject
+    private TaskAssignmentMarshaller taskAssignmentMarshaller;
+    @Inject
+    private PermissionMarshaller permissionMarshaller;
 
 
-    static void importCategories() {
-        CategoryMarshaller categoryMarshaller = new
-                CategoryMarshaller();
+    public void importCategories() {
         categoryMarshaller.prepare(Format.XML, pathName,
                 "categories.xml", indentation);
         List<Category> categories = categoryMarshaller.importFile();
     }
 
-    static void importCategorizations() {
-        CategorizationMarshaller categorizationMarshaller = new
-                CategorizationMarshaller();
+    public void importCategorizations() {
         categorizationMarshaller.prepare(Format.XML, pathName,
                 "categorizations.xml", indentation);
         categorizationMarshaller.importFile();
     }
 
-    static void importUsers() {
-        UserMarshaller userMarshaller = new UserMarshaller();
+    public void importUsers() {
         userMarshaller.prepare(Format.XML, pathName,
                 "users.xml", indentation);
         userMarshaller.importFile();
     }
 
-    static void importGroups() {
-        GroupMarshaller groupMarshaller = new GroupMarshaller();
+    public void importGroups() {
         groupMarshaller.prepare(Format.XML, pathName,
                 "groups.xml", indentation);
         groupMarshaller.importFile();
     }
 
-    static void importGroupMemberships() {
-        GroupMembershipMarshaller groupMembershipMarshaller = new
-                GroupMembershipMarshaller();
+    public void importGroupMemberships() {
+
         groupMembershipMarshaller.prepare(Format.XML, pathName,
                 "groupMemberships.xml", indentation);
         groupMembershipMarshaller.importFile();
     }
 
-    static void importRoles() {
-        RoleMarshaller roleMarshaller = new RoleMarshaller();
+    public void importRoles() {
         roleMarshaller.prepare(Format.XML, pathName,
                 "roles.xml", indentation);
         roleMarshaller.importFile();
     }
 
-    static void importRoleMemberships() {
-        RoleMembershipMarshaller roleMembershipMarshaller = new
-                RoleMembershipMarshaller();
+    public void importRoleMemberships() {
         roleMembershipMarshaller.prepare(Format.XML, pathName,
                 "roleMemberships.xml", indentation);
         roleMembershipMarshaller.importFile();
     }
 
-    static void importWorkflowTemplates() {
-        WorkflowTemplateMarshaller workflowTemplateMarshaller = new
-                WorkflowTemplateMarshaller();
+    public void importWorkflowTemplates() {
         workflowTemplateMarshaller.prepare(Format.XML, pathName,
                 "workflowTemplates.xml", indentation);
         workflowTemplateMarshaller.importFile();
     }
 
-    static void importWorkflows() {
-        WorkflowMarshaller workflowMarshaller = new
-                WorkflowMarshaller();
+    public void importWorkflows() {
         workflowMarshaller.prepare(Format.XML, pathName,
                 "workflows.xml", indentation);
         workflowMarshaller.importFile();
     }
 
-    static void importAssignableTasks() {
-        AssignableTaskMarshaller assignableTaskMarshaller = new
-                AssignableTaskMarshaller();
+    public void importAssignableTasks() {
         assignableTaskMarshaller.prepare(Format.XML, pathName,
                 "assignableTasks.xml", indentation);
         assignableTaskMarshaller.importFile();
     }
 
-    static void importTaskAssignments() {
-        TaskAssignmentMarshaller taskAssignmentMarshaller = new
-                TaskAssignmentMarshaller();
+    public void importTaskAssignments() {
         taskAssignmentMarshaller.prepare(Format.XML, pathName,
                 "taskAssignments.xml", indentation);
         taskAssignmentMarshaller.importFile();
     }
 
-    static void importPermissions() {
-        PermissionMarshaller permissionMarshaller = new
-                PermissionMarshaller();
+    public void importPermissions() {
         permissionMarshaller.prepare(Format.XML, pathName,
                 "permissions.xml", indentation);
         permissionMarshaller.importFile();