From 1c598b387ee521d83f29ca342764641cbf1521bb Mon Sep 17 00:00:00 2001 From: tosmers Date: Thu, 19 Jan 2017 20:47:31 +0000 Subject: [PATCH] [UPDATE] - adds modified files for import testing - adds annotations @RequestScoped and @Marshals() 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: 389f8ef6cfa270e3982c2468b6a45037ce2d3612 --- .../CategorizationMarshaller.java | 4 + .../categorization/CategoryMarshaller.java | 4 + .../org/libreccm/l10n/LocalizedString.java | 7 +- .../portation/AbstractMarshaller.java | 11 +- .../libreccm/security/GroupMarshaller.java | 4 + .../security/PermissionMarshaller.java | 4 + .../org/libreccm/security/RoleMarshaller.java | 4 + .../security/RoleMembershipMarshaller.java | 4 + .../org/libreccm/security/UserMarshaller.java | 4 + .../workflow/AssignableTaskMarshaller.java | 4 + .../workflow/TaskAssignmentMarshaller.java | 4 + .../libreccm/workflow/WorkflowMarshaller.java | 4 + .../workflow/WorkflowTemplateMarshaller.java | 4 + .../assignableTasks.xml.REMOVED.git-id | 2 +- .../trunk-iaw-exports/categories.xml | 338 +- .../trunk-iaw-exports/groupMemberships.xml | 16 +- .../portation/trunk-iaw-exports/groups.xml | 32 +- .../trunk-iaw-exports/permissions.xml | 32674 +++++------ .../trunk-iaw-exports/roleMemberships.xml | 45644 ++++++++-------- .../portation/trunk-iaw-exports/roles.xml | 2142 +- .../portation/trunk-iaw-exports/users.xml | 86 +- .../workflows.xml.REMOVED.git-id | 2 +- 22 files changed, 40525 insertions(+), 40473 deletions(-) diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java b/ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java index 1c9bd23c3..a59223507 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java +++ b/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 Tobias Osmers * @version created on 11/7/16 */ +@RequestScoped +@Marshals(Category.class) public class CategoryMarshaller extends AbstractMarshaller { @Inject diff --git a/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java b/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java index 32c5c9699..c636d4fb7 100644 --- a/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java +++ b/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 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 getAvailableLocales() { return values.keySet(); } diff --git a/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java b/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java index 2659294fc..bac2cf150 100644 --- a/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java +++ b/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java @@ -189,6 +189,7 @@ public abstract class AbstractMarshaller

{ List

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

{ break; } - assert object != null; - insertIntoDb(object); - objects.add(object); + if (object != null) { + insertIntoDb(object); + objects.add(object); + } else { + emptyObjects+=1; + LOGGER.info("Count of empty objects: {}", emptyObjects); + } } } return objects; diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.java index e4c8dbce3..ed31d08e5 100644 --- a/ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.java +++ b/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 Tobias Osmers * @version created on 11/7/16 */ +@RequestScoped +@Marshals(Permission.class) public class PermissionMarshaller extends AbstractMarshaller { @Inject diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/RoleMarshaller.java index 40423ee88..650dfa03c 100644 --- a/ccm-core/src/main/java/org/libreccm/security/RoleMarshaller.java +++ b/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 Tobias Osmers * @version created on 11/7/16 */ +@RequestScoped +@Marshals(RoleMembership.class) public class RoleMembershipMarshaller extends AbstractMarshaller { @Inject diff --git a/ccm-core/src/main/java/org/libreccm/security/UserMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/UserMarshaller.java index 450553d95..280d3f7ff 100644 --- a/ccm-core/src/main/java/org/libreccm/security/UserMarshaller.java +++ b/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 Tobias Osmers * @version created on 11/18/16 */ +@RequestScoped +@Marshals(AssignableTask.class) public class AssignableTaskMarshaller extends AbstractMarshaller { @Inject diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java index 1df7c75dd..0f1bcf81c 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java +++ b/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 Tobias Osmers * @version created on 11/7/16 */ +@RequestScoped +@Marshals(Workflow.class) public class WorkflowMarshaller extends AbstractMarshaller { @Inject diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplateMarshaller.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplateMarshaller.java index 49f9119fe..cba065f2a 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplateMarshaller.java +++ b/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