[UPDATE]

- adds modified files for import testing
- adds annotations @RequestScoped and @Marshals(<classname>) to all Marshaller classes
- adds annotation @JsonIgnore to getter in LocalizedString.java

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

Former-commit-id: 389f8ef6cf

ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java

@@ -19,7 +19,9 @@
 package org.libreccm.categorization;
 
 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(Categorization.class)
 public class CategorizationMarshaller extends AbstractMarshaller<Categorization>{
 
     @Inject

ccm-core/src/main/java/org/libreccm/categorization/CategoryMarshaller.java

@@ -19,7 +19,9 @@
 package org.libreccm.categorization;
 
 import org.libreccm.portation.AbstractMarshaller;
+import org.libreccm.portation.Marshals;
 
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 
@@ -27,6 +29,8 @@ import javax.transaction.Transactional;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 11/7/16
  */
+@RequestScoped
+@Marshals(Category.class)
 public class CategoryMarshaller extends AbstractMarshaller<Category> {
 
     @Inject

ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java

@@ -38,6 +38,8 @@ import javax.persistence.MapKeyColumn;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.hibernate.annotations.Type;
 import org.hibernate.search.annotations.Field;
 
@@ -60,13 +62,13 @@ public class LocalizedString implements Serializable {
      */
     @ElementCollection(fetch = FetchType.EAGER)
     @MapKeyColumn(name = "LOCALE")
-    @Column(name = "LOCALIZED_VALUE")
+    @Column(name = "LOCALIZED_VALUES")
     @Basic
     @Lob
     @Type(type = "org.hibernate.type.TextType")
     @Field
     @XmlElementWrapper(name = "values", namespace = L10N_XML_NS)
-    @XmlElement(name = "value", namespace = L10N_XML_NS)
+    @XmlElement(name = "values", namespace = L10N_XML_NS)
     private Map<Locale, String> values;
 
     /**
@@ -161,6 +163,7 @@ public class LocalizedString implements Serializable {
      * @return A {@link Set} containing all locales for which this localised
      *         string has values.
      */
+    @JsonIgnore
     public Set<Locale> getAvailableLocales() {
         return values.keySet();
     }

ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java

@@ -189,6 +189,7 @@ public abstract class AbstractMarshaller<P extends Portable> {
 
         List<P> objects = new ArrayList<>();
         if (lines != null) {
+            int emptyObjects = 0;
             for (String line : lines) {
                 P object = null;
                 switch (format) {
@@ -206,9 +207,13 @@ public abstract class AbstractMarshaller<P extends Portable> {
                         break;
                 }
 
-                assert object != null;
+                if (object != null) {
-                insertIntoDb(object);
+                    insertIntoDb(object);
-                objects.add(object);
+                    objects.add(object);
+                } else {
+                    emptyObjects+=1;
+                    LOGGER.info("Count of empty objects: {}", emptyObjects);
+                }
             }
         }
         return objects;

ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.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.transaction.Transactional;
 
@@ -27,6 +29,8 @@ import javax.transaction.Transactional;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 11/7/16
  */
+@RequestScoped
+@Marshals(Group.class)
 public class GroupMarshaller extends AbstractMarshaller<Group> {
 
     @Inject

ccm-core/src/main/java/org/libreccm/security/PermissionMarshaller.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(Permission.class)
 public class PermissionMarshaller extends AbstractMarshaller<Permission> {
 
     @Inject

ccm-core/src/main/java/org/libreccm/security/RoleMarshaller.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.transaction.Transactional;
 
@@ -27,6 +29,8 @@ import javax.transaction.Transactional;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 11/7/16
  */
+@RequestScoped
+@Marshals(Role.class)
 public class RoleMarshaller extends AbstractMarshaller<Role> {
 
     @Inject

ccm-core/src/main/java/org/libreccm/security/RoleMembershipMarshaller.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(RoleMembership.class)
 public class RoleMembershipMarshaller extends AbstractMarshaller<RoleMembership> {
 
     @Inject

ccm-core/src/main/java/org/libreccm/security/UserMarshaller.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.transaction.Transactional;
 
@@ -27,6 +29,8 @@ import javax.transaction.Transactional;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 11/7/16
  */
+@RequestScoped
+@Marshals(User.class)
 public class UserMarshaller extends AbstractMarshaller<User> {
 
     @Inject

ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskMarshaller.java

@@ -19,7 +19,9 @@
 package org.libreccm.workflow;
 
 import org.libreccm.portation.AbstractMarshaller;
+import org.libreccm.portation.Marshals;
 
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 
@@ -27,6 +29,8 @@ import javax.transaction.Transactional;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 11/18/16
  */
+@RequestScoped
+@Marshals(AssignableTask.class)
 public class AssignableTaskMarshaller extends AbstractMarshaller<AssignableTask> {
 
     @Inject

ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java

@@ -19,7 +19,9 @@
 package org.libreccm.workflow;
 
 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(TaskAssignment.class)
 public class TaskAssignmentMarshaller extends AbstractMarshaller<TaskAssignment> {
 
     @Inject

ccm-core/src/main/java/org/libreccm/workflow/WorkflowMarshaller.java

@@ -19,7 +19,9 @@
 package org.libreccm.workflow;
 
 import org.libreccm.portation.AbstractMarshaller;
+import org.libreccm.portation.Marshals;
 
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 
@@ -27,6 +29,8 @@ import javax.transaction.Transactional;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 11/7/16
  */
+@RequestScoped
+@Marshals(Workflow.class)
 public class WorkflowMarshaller extends AbstractMarshaller<Workflow> {
 
     @Inject

ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplateMarshaller.java

@@ -19,7 +19,9 @@
 package org.libreccm.workflow;
 
 import org.libreccm.portation.AbstractMarshaller;
+import org.libreccm.portation.Marshals;
 
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 
@@ -27,6 +29,8 @@ import javax.transaction.Transactional;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 11/21/16
  */
+@RequestScoped
+@Marshals(WorkflowTemplate.class)
 public class WorkflowTemplateMarshaller extends
         AbstractMarshaller<WorkflowTemplate> {
 

ccm-core/src/test/resources/portation/trunk-iaw-exports/assignableTasks.xml.REMOVED.git-id

@@ -1 +1 @@
-974f14553c12ba386b44ff3d9d03370b541ecf50
+2360d180c42c314f7e0193dc2cba611e2fca0331

ccm-core/src/test/resources/portation/trunk-iaw-exports/groupMemberships.xml

@@ -1,8 +1,8 @@
-<GroupMembership><membershipId>1</membershipId><marshaller/></GroupMembership>
+<GroupMembership><membershipId>1</membershipId></GroupMembership>
-<GroupMembership><membershipId>2</membershipId><marshaller/></GroupMembership>
+<GroupMembership><membershipId>2</membershipId></GroupMembership>
-<GroupMembership><membershipId>3</membershipId><marshaller/></GroupMembership>
+<GroupMembership><membershipId>3</membershipId></GroupMembership>
-<GroupMembership><membershipId>4</membershipId><marshaller/></GroupMembership>
+<GroupMembership><membershipId>4</membershipId></GroupMembership>
-<GroupMembership><membershipId>5</membershipId><marshaller/></GroupMembership>
+<GroupMembership><membershipId>5</membershipId></GroupMembership>
-<GroupMembership><membershipId>6</membershipId><marshaller/></GroupMembership>
+<GroupMembership><membershipId>6</membershipId></GroupMembership>
-<GroupMembership><membershipId>7</membershipId><marshaller/></GroupMembership>
+<GroupMembership><membershipId>7</membershipId></GroupMembership>
-<GroupMembership><membershipId>8</membershipId><marshaller/></GroupMembership>
+<GroupMembership><membershipId>8</membershipId></GroupMembership>

ccm-core/src/test/resources/portation/trunk-iaw-exports/groups.xml

@@ -1,16 +1,16 @@
-<Group><partyId>541003</partyId><name>projects Administration</name><memberships><membershipId>8</membershipId><marshaller/></memberships><marshaller/></Group>
+<Group><partyId>541003</partyId><name>projects Administration</name><memberships><membershipId>8</membershipId></memberships></Group>
-<Group><partyId>1061</partyId><name>content Administration</name><memberships><membershipId>6</membershipId><marshaller/></memberships><marshaller/></Group>
+<Group><partyId>1061</partyId><name>content Administration</name><memberships><membershipId>6</membershipId></memberships></Group>
-<Group><partyId>541006</partyId><name>projects Viewers</name><marshaller/></Group>
+<Group><partyId>541006</partyId><name>projects Viewers</name></Group>
-<Group><partyId>1064</partyId><name>content Viewers</name><marshaller/></Group>
+<Group><partyId>1064</partyId><name>content Viewers</name></Group>
-<Group><partyId>1339004</partyId><name>homepages Viewers</name><marshaller/></Group>
+<Group><partyId>1339004</partyId><name>homepages Viewers</name></Group>
-<Group><partyId>3439036</partyId><name>publications Viewers</name><marshaller/></Group>
+<Group><partyId>3439036</partyId><name>publications Viewers</name></Group>
-<Group><partyId>5619069</partyId><name>euss Administration</name><marshaller/></Group>
+<Group><partyId>5619069</partyId><name>euss Administration</name></Group>
-<Group><partyId>-300</partyId><name>Site-wide Administrators</name><roleMemberships><membershipId>109</membershipId><marshaller/></roleMemberships><roleMemberships><membershipId>136</membershipId><marshaller/></roleMemberships><roleMemberships><membershipId>140</membershipId><marshaller/></roleMemberships><roleMemberships><membershipId>123</membershipId><marshaller/></roleMemberships><roleMemberships><membershipId>152</membershipId><marshaller/></roleMemberships><roleMemberships><membershipId>154</membershipId><marshaller/></roleMemberships><roleMemberships><membershipId>153</membershipId><marshaller/></roleMemberships><roleMemberships><membershipId>130</membershipId><marshaller/></roleMemberships><roleMemberships><membershipId>116</membershipId><marshaller/></roleMemberships><roleMemberships><membershipId>158</membershipId><marshaller/></roleMemberships><roleMemberships><membershipId>112</membershipId><marshaller/></roleMemberships><roleMemberships><membershipId>157</membershipId><marshaller/></roleMemberships><memberships><membershipId>3</membershipId><marshaller/></memberships><memberships><membershipId>4</membershipId><marshaller/></memberships><memberships><membershipId>1</membershipId><marshaller/></memberships><memberships><membershipId>5</membershipId><marshaller/></memberships><memberships><membershipId>2</membershipId><marshaller/></memberships><marshaller/></Group>
+<Group><partyId>-300</partyId><name>Site-wide Administrators</name><roleMemberships><membershipId>157</membershipId></roleMemberships><roleMemberships><membershipId>152</membershipId></roleMemberships><roleMemberships><membershipId>130</membershipId></roleMemberships><roleMemberships><membershipId>153</membershipId></roleMemberships><roleMemberships><membershipId>123</membershipId></roleMemberships><roleMemberships><membershipId>136</membershipId></roleMemberships><roleMemberships><membershipId>158</membershipId></roleMemberships><roleMemberships><membershipId>109</membershipId></roleMemberships><roleMemberships><membershipId>154</membershipId></roleMemberships><roleMemberships><membershipId>112</membershipId></roleMemberships><roleMemberships><membershipId>116</membershipId></roleMemberships><roleMemberships><membershipId>140</membershipId></roleMemberships><memberships><membershipId>1</membershipId></memberships><memberships><membershipId>2</membershipId></memberships><memberships><membershipId>3</membershipId></memberships><memberships><membershipId>4</membershipId></memberships><memberships><membershipId>5</membershipId></memberships></Group>
-<Group><partyId>5619070</partyId><name>euss Viewers</name><marshaller/></Group>
+<Group><partyId>5619070</partyId><name>euss Viewers</name></Group>
-<Group><partyId>1339003</partyId><name>homepages Administration</name><marshaller/></Group>
+<Group><partyId>1339003</partyId><name>homepages Administration</name></Group>
-<Group><partyId>3439035</partyId><name>publications Administration</name><marshaller/></Group>
+<Group><partyId>3439035</partyId><name>publications Administration</name></Group>
-<Group><partyId>1937037</partyId><name>research Viewers</name><marshaller/></Group>
+<Group><partyId>1937037</partyId><name>research Viewers</name></Group>
-<Group><partyId>1937036</partyId><name>research Administration</name><marshaller/></Group>
+<Group><partyId>1937036</partyId><name>research Administration</name></Group>
-<Group><partyId>1271</partyId><name>Portal Workspace Groups</name><marshaller/></Group>
+<Group><partyId>1271</partyId><name>Portal Workspace Groups</name></Group>
-<Group><partyId>1274</partyId><name>Portal Homepage</name><marshaller/></Group>
+<Group><partyId>1274</partyId><name>Portal Homepage</name></Group>
-<Group><partyId>1278</partyId><name>Portal Homepage</name><memberships><membershipId>7</membershipId><marshaller/></memberships><marshaller/></Group>
+<Group><partyId>1278</partyId><name>Portal Homepage</name><memberships><membershipId>7</membershipId></memberships></Group>

ccm-core/src/test/resources/portation/trunk-iaw-exports/workflows.xml.REMOVED.git-id

@@ -1 +1 @@
-04e8b09bb7d8fcb70cfc9158db742608a44d65eb
+59e0c387f48646fc317fdde9b796a6012593480b