From 903d3a1c762f276b1b4e84a0c4289bf7349631c9 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 26 Nov 2022 13:34:07 +0100 Subject: [PATCH] Updated ImExporter to work with updated AbstractContentItemImExporter --- .../publications/AbstractPublicationImExporter.java | 2 +- .../AbstractPublicationWithPublisherImExporter.java | 2 -- .../ArticleInCollectedVolumeItemImExporter.java | 5 +---- .../contenttypes/ArticleInJournalItemImExporter.java | 4 +--- .../contenttypes/CollectedVolumeItemImExporter.java | 4 +--- .../publications/contenttypes/ExpertiseItemImExporter.java | 4 +--- .../contenttypes/GreyLiteratureItemImExporter.java | 4 +--- .../contenttypes/InProceedingsItemImExporter.java | 4 +--- .../contenttypes/InternetArticleItemImExporter.java | 7 +++++++ .../publications/contenttypes/MonographItemImExporter.java | 5 +---- .../contenttypes/ProceedingsItemImExporter.java | 4 +--- .../publications/contenttypes/TalkItemImExporter.java | 5 +++++ .../contenttypes/WorkingPaperItemImExporter.java | 4 +--- .../scidepartment/SciDepartmentImExporter.java | 6 ++++++ .../contenttypes/sciproject/SciProjectImExporter.java | 5 +++++ 15 files changed, 33 insertions(+), 32 deletions(-) diff --git a/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationImExporter.java index d6375b0..a275b12 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationImExporter.java @@ -14,7 +14,7 @@ public abstract class AbstractPublicationImExporter @Inject private PublicationRepository publicationRepo; - + @Override protected void saveImportedEntity(final Publication publication) { publicationRepo.save(publication); diff --git a/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationWithPublisherImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationWithPublisherImExporter.java index 2c4335d..601661c 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationWithPublisherImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationWithPublisherImExporter.java @@ -2,7 +2,6 @@ package org.scientificcms.publications; import java.util.Set; -import javax.annotation.PostConstruct; /** * @@ -13,7 +12,6 @@ public abstract class AbstractPublicationWithPublisherImExporter { @Override - @PostConstruct protected final void init() { addRequiredEntities( Set.of( diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInCollectedVolumeItemImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInCollectedVolumeItemImExporter.java index b3d00fc..4420ecb 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInCollectedVolumeItemImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInCollectedVolumeItemImExporter.java @@ -5,7 +5,6 @@ import org.librecms.contentsection.AbstractContentItemImExporter; import java.util.Set; -import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; /** @@ -16,10 +15,8 @@ import javax.enterprise.context.RequestScoped; @Processes(ArticleInCollectedVolumeItem.class) public class ArticleInCollectedVolumeItemImExporter extends AbstractContentItemImExporter { - @PostConstruct @Override - protected void init() { - super.init(); + protected void initContentItemImExporter() { addRequiredEntities( Set.of( CollectedVolumeItem.class diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInJournalItemImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInJournalItemImExporter.java index e07832d..5f2dc68 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInJournalItemImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInJournalItemImExporter.java @@ -6,7 +6,6 @@ import org.scientificcms.publications.assets.JournalAsset; import java.util.Set; -import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; /** @@ -18,9 +17,8 @@ import javax.enterprise.context.RequestScoped; public class ArticleInJournalItemImExporter extends AbstractContentItemImExporter { - @PostConstruct @Override - protected void init() { + protected void initContentItemImExporter() { super.init(); addRequiredEntities( Set.of( diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/CollectedVolumeItemImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/CollectedVolumeItemImExporter.java index 024dfce..70f13a5 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/CollectedVolumeItemImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/CollectedVolumeItemImExporter.java @@ -6,7 +6,6 @@ import org.scientificcms.publications.assets.PublisherAsset; import java.util.Set; -import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; /** @@ -18,9 +17,8 @@ import javax.enterprise.context.RequestScoped; public class CollectedVolumeItemImExporter extends AbstractContentItemImExporter { - @PostConstruct @Override - protected void init() { + protected void initContentItemImExporter() { super.init(); addRequiredEntities( Set.of( diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ExpertiseItemImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ExpertiseItemImExporter.java index 7bd0a3e..3baf50f 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ExpertiseItemImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ExpertiseItemImExporter.java @@ -6,7 +6,6 @@ import org.librecms.contentsection.AbstractContentItemImExporter; import java.util.Set; -import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; /** @@ -18,9 +17,8 @@ import javax.enterprise.context.RequestScoped; public class ExpertiseItemImExporter extends AbstractContentItemImExporter { - @PostConstruct @Override - protected void init() { + protected void initContentItemImExporter() { super.init(); addRequiredEntities( Set.of( diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/GreyLiteratureItemImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/GreyLiteratureItemImExporter.java index 83ae136..4001275 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/GreyLiteratureItemImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/GreyLiteratureItemImExporter.java @@ -6,7 +6,6 @@ import org.librecms.contentsection.AbstractContentItemImExporter; import java.util.Set; -import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; /** @@ -18,9 +17,8 @@ import javax.enterprise.context.RequestScoped; public class GreyLiteratureItemImExporter extends AbstractContentItemImExporter { - @PostConstruct @Override - protected void init() { + protected void initContentItemImExporter() { super.init(); addRequiredEntities( Set.of( diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItemImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItemImExporter.java index a0b4dc4..7e16169 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItemImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItemImExporter.java @@ -5,7 +5,6 @@ import org.librecms.contentsection.AbstractContentItemImExporter; import java.util.Set; -import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; /** @@ -17,9 +16,8 @@ import javax.enterprise.context.RequestScoped; public class InProceedingsItemImExporter extends AbstractContentItemImExporter { - @PostConstruct @Override - protected void init() { + protected void initContentItemImExporter() { super.init(); addRequiredEntities( Set.of( diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InternetArticleItemImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InternetArticleItemImExporter.java index badae53..2da3c6a 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InternetArticleItemImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InternetArticleItemImExporter.java @@ -14,9 +14,16 @@ import javax.enterprise.context.RequestScoped; public class InternetArticleItemImExporter extends AbstractContentItemImExporter{ + @Override + protected void initContentItemImExporter() { + // Nothing + } + @Override public Class getEntityClass() { return InternetArticleItem.class; } + + } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/MonographItemImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/MonographItemImExporter.java index 50ba214..3998f7e 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/MonographItemImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/MonographItemImExporter.java @@ -6,7 +6,6 @@ import org.scientificcms.publications.assets.PublisherAsset; import java.util.Set; -import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; /** @@ -18,10 +17,8 @@ import javax.enterprise.context.RequestScoped; public class MonographItemImExporter extends AbstractContentItemImExporter { - @PostConstruct @Override - protected void init() { - super.init(); + protected void initContentItemImExporter() { addRequiredEntities( Set.of( PublisherAsset.class diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItemImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItemImExporter.java index bb5085e..b0b5112 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItemImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItemImExporter.java @@ -7,7 +7,6 @@ import org.scientificcms.publications.assets.PublisherAsset; import java.util.Set; -import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; /** @@ -19,9 +18,8 @@ import javax.enterprise.context.RequestScoped; public class ProceedingsItemImExporter extends AbstractContentItemImExporter { - @PostConstruct @Override - protected void init() { + protected void initContentItemImExporter() { super.init(); addRequiredEntities( Set.of( diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItemImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItemImExporter.java index 04dc811..034c274 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItemImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItemImExporter.java @@ -19,4 +19,9 @@ public class TalkItemImExporter return TalkItem.class; } + @Override + protected void initContentItemImExporter() { + // Nothing + } + } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/WorkingPaperItemImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/WorkingPaperItemImExporter.java index 9570c83..4aaf3c8 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/WorkingPaperItemImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/WorkingPaperItemImExporter.java @@ -6,7 +6,6 @@ import org.librecms.contentsection.AbstractContentItemImExporter; import java.util.Set; -import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; /** @@ -18,9 +17,8 @@ import javax.enterprise.context.RequestScoped; public class WorkingPaperItemImExporter extends AbstractContentItemImExporter { - @PostConstruct @Override - protected void init() { + protected void initContentItemImExporter() { super.init(); addRequiredEntities( Set.of( diff --git a/sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/SciDepartmentImExporter.java b/sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/SciDepartmentImExporter.java index ceb6502..045de0c 100644 --- a/sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/SciDepartmentImExporter.java +++ b/sci-types-department/src/main/java/org/scientificcms/contenttypes/scidepartment/SciDepartmentImExporter.java @@ -14,6 +14,12 @@ import javax.enterprise.context.RequestScoped; public class SciDepartmentImExporter extends AbstractContentItemImExporter{ + @Override + protected void initContentItemImExporter() { + // Nothing + } + + @Override public Class getEntityClass() { return SciDepartment.class; diff --git a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/SciProjectImExporter.java b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/SciProjectImExporter.java index 7533b7d..15e22df 100644 --- a/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/SciProjectImExporter.java +++ b/sci-types-project/src/main/java/org/scientificcms/contenttypes/sciproject/SciProjectImExporter.java @@ -18,6 +18,11 @@ import javax.enterprise.context.RequestScoped; @Processes(SciProject.class) public class SciProjectImExporter extends AbstractContentItemImExporter{ + @Override + protected void initContentItemImExporter() { + // Nothing + } + @Override public Class getEntityClass() { return SciProject.class;