diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ArticleInCollectedVolumeImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/ArticleInCollectedVolumeImExporter.java index ac10cae..8713983 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ArticleInCollectedVolumeImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ArticleInCollectedVolumeImExporter.java @@ -13,8 +13,8 @@ import javax.enterprise.context.RequestScoped; */ @RequestScoped @Processes(ArticleInCollectedVolume.class) -public class ArticleInCollectedVolumeImExporter -extends AbstractPublicationImExporter{ +public class ArticleInCollectedVolumeImExporter + extends AbstractPublicationImExporter { @Override public Class getEntityClass() { @@ -24,13 +24,7 @@ extends AbstractPublicationImExporter{ @Override @PostConstruct protected void init() { - addRequiredEntities( - Set.of( - CollectedVolume.class - ) - ); + addRequiredEntities(Set.of(CollectedVolume.class)); } - - - + } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ArticleInJournalImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/ArticleInJournalImExporter.java index 85feed4..e7d80c3 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ArticleInJournalImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ArticleInJournalImExporter.java @@ -24,11 +24,7 @@ public class ArticleInJournalImExporter @Override @PostConstruct protected void init() { - addRequiredEntities( - Set.of( - Journal.class - ) - ); + addRequiredEntities(Set.of(Journal.class)); } } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ExpertiseImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/ExpertiseImExporter.java index b48c739..7310e2b 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ExpertiseImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ExpertiseImExporter.java @@ -14,8 +14,8 @@ import javax.enterprise.context.RequestScoped; */ @RequestScoped @Processes(Expertise.class) -public class ExpertiseImExporter - extends AbstractPublicationImExporter{ +public class ExpertiseImExporter + extends AbstractPublicationImExporter { @Override public Class getEntityClass() { @@ -25,11 +25,7 @@ public class ExpertiseImExporter @Override @PostConstruct protected void init() { - addRequiredEntities( - Set.of( - Organization.class - ) - ); + addRequiredEntities(Set.of(Organization.class)); } - + } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/GreyLiteratureImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/GreyLiteratureImExporter.java index a5fca4d..6a6a50a 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/GreyLiteratureImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/GreyLiteratureImExporter.java @@ -1,6 +1,9 @@ package org.scientificcms.publications; import org.libreccm.imexport.Processes; +import org.librecms.assets.Organization; + +import java.util.Set; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; @@ -22,7 +25,7 @@ public class GreyLiteratureImExporter @Override @PostConstruct protected void initUnPublishedImExporter() { - // Nothing + addRequiredEntities(Set.of(Organization.class)); } } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/InProceedingsImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/InProceedingsImExporter.java index fbcbc26..9d244a1 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/InProceedingsImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/InProceedingsImExporter.java @@ -24,11 +24,7 @@ public class InProceedingsImExporter @Override @PostConstruct protected void init() { - addRequiredEntities( - Set.of( - Proceedings.class - ) - ); + addRequiredEntities(Set.of(Proceedings.class)); } } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/InternetArticleImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/InternetArticleImExporter.java index 69a2bf2..cb6a537 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/InternetArticleImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/InternetArticleImExporter.java @@ -25,11 +25,7 @@ public class InternetArticleImExporter @Override @PostConstruct protected void init() { - addRequiredEntities( - Set.of( - Organization.class - ) - ); + addRequiredEntities(Set.of(Organization.class)); } } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/WorkingPaperImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/WorkingPaperImExporter.java index efb405f..228ed86 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/WorkingPaperImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/WorkingPaperImExporter.java @@ -1,6 +1,9 @@ package org.scientificcms.publications; import org.libreccm.imexport.Processes; +import org.librecms.assets.Organization; + +import java.util.Set; import javax.enterprise.context.RequestScoped; @@ -10,19 +13,17 @@ import javax.enterprise.context.RequestScoped; */ @RequestScoped @Processes(WorkingPaper.class) -public class WorkingPaperImExporter - extends AbstractUnPublishedImExporter{ +public class WorkingPaperImExporter + extends AbstractUnPublishedImExporter { @Override public Class getEntityClass() { - return WorkingPaper.class; + return WorkingPaper.class; } @Override protected void initUnPublishedImExporter() { - // Nothing + addRequiredEntities(Set.of(Organization.class)); } - - - + } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/assets/SeriesAssetImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/assets/SeriesAssetImExporter.java index 6a2fe9c..4e5854f 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/assets/SeriesAssetImExporter.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/assets/SeriesAssetImExporter.java @@ -3,8 +3,10 @@ package org.scientificcms.publications.assets; import org.libreccm.imexport.AbstractEntityImExporter; import org.libreccm.imexport.Processes; import org.librecms.contentsection.AssetRepository; +import org.scientificcms.publications.Series; import java.util.Objects; +import java.util.Set; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; @@ -26,7 +28,7 @@ extends AbstractEntityImExporter { @PostConstruct @Override protected void init() { - // Nothing + addRequiredEntities(Set.of(Series.class)); } @Override 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 4420ecb..fa04263 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 @@ -2,6 +2,7 @@ package org.scientificcms.publications.contenttypes; import org.libreccm.imexport.Processes; import org.librecms.contentsection.AbstractContentItemImExporter; +import org.scientificcms.publications.ArticleInCollectedVolume; import java.util.Set; @@ -17,11 +18,7 @@ public class ArticleInCollectedVolumeItemImExporter extends AbstractContentItemI @Override protected void initContentItemImExporter() { - addRequiredEntities( - Set.of( - CollectedVolumeItem.class - ) - ); + addRequiredEntities(Set.of(ArticleInCollectedVolume.class)); } @Override 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 cca9732..197ae8c 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 @@ -2,7 +2,7 @@ package org.scientificcms.publications.contenttypes; import org.libreccm.imexport.Processes; import org.librecms.contentsection.AbstractContentItemImExporter; -import org.scientificcms.publications.assets.JournalAsset; +import org.scientificcms.publications.ArticleInJournal; import java.util.Set; @@ -19,13 +19,9 @@ public class ArticleInJournalItemImExporter @Override protected void initContentItemImExporter() { - addRequiredEntities( - Set.of( - JournalAsset.class - ) - ); + addRequiredEntities(Set.of(ArticleInJournal.class)); } - + @Override public Class getEntityClass() { return ArticleInJournalItem.class; 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 649e2e5..1b9d311 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 @@ -2,7 +2,7 @@ package org.scientificcms.publications.contenttypes; import org.libreccm.imexport.Processes; import org.librecms.contentsection.AbstractContentItemImExporter; -import org.scientificcms.publications.assets.PublisherAsset; +import org.scientificcms.publications.CollectedVolume; import java.util.Set; @@ -19,11 +19,7 @@ public class CollectedVolumeItemImExporter @Override protected void initContentItemImExporter() { - addRequiredEntities( - Set.of( - PublisherAsset.class - ) - ); + addRequiredEntities(Set.of(CollectedVolume.class)); } @Override 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 a24d197..0e9e88c 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 @@ -1,8 +1,8 @@ package org.scientificcms.publications.contenttypes; import org.libreccm.imexport.Processes; -import org.librecms.assets.Organization; import org.librecms.contentsection.AbstractContentItemImExporter; +import org.scientificcms.publications.Expertise; import java.util.Set; @@ -19,11 +19,7 @@ public class ExpertiseItemImExporter @Override protected void initContentItemImExporter() { - addRequiredEntities( - Set.of( - Organization.class - ) - ); + addRequiredEntities(Set.of(Expertise.class)); } @Override 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 3ef3f88..41ed6b5 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 @@ -1,8 +1,8 @@ package org.scientificcms.publications.contenttypes; import org.libreccm.imexport.Processes; -import org.librecms.assets.Organization; import org.librecms.contentsection.AbstractContentItemImExporter; +import org.scientificcms.publications.GreyLiterature; import java.util.Set; @@ -19,11 +19,7 @@ public class GreyLiteratureItemImExporter @Override protected void initContentItemImExporter() { - addRequiredEntities( - Set.of( - Organization.class - ) - ); + addRequiredEntities(Set.of(GreyLiterature.class)); } @Override 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 9b41d40..27bc1b7 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 @@ -2,6 +2,7 @@ package org.scientificcms.publications.contenttypes; import org.libreccm.imexport.Processes; import org.librecms.contentsection.AbstractContentItemImExporter; +import org.scientificcms.publications.InProceedings; import java.util.Set; @@ -18,11 +19,7 @@ public class InProceedingsItemImExporter @Override protected void initContentItemImExporter() { - addRequiredEntities( - Set.of( - ProceedingsItem.class - ) - ); + addRequiredEntities(Set.of(InProceedings.class)); } @Override 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 3998f7e..ac0c754 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 @@ -2,6 +2,7 @@ package org.scientificcms.publications.contenttypes; import org.libreccm.imexport.Processes; import org.librecms.contentsection.AbstractContentItemImExporter; +import org.scientificcms.publications.Monograph; import org.scientificcms.publications.assets.PublisherAsset; import java.util.Set; @@ -19,11 +20,7 @@ public class MonographItemImExporter @Override protected void initContentItemImExporter() { - addRequiredEntities( - Set.of( - PublisherAsset.class - ) - ); + addRequiredEntities(Set.of(Monograph.class)); } @Override 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 dedc780..94d94b5 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 @@ -1,9 +1,8 @@ package org.scientificcms.publications.contenttypes; import org.libreccm.imexport.Processes; -import org.librecms.assets.Organization; import org.librecms.contentsection.AbstractContentItemImExporter; -import org.scientificcms.publications.assets.PublisherAsset; +import org.scientificcms.publications.Proceedings; import java.util.Set; @@ -20,12 +19,7 @@ public class ProceedingsItemImExporter @Override protected void initContentItemImExporter() { - addRequiredEntities( - Set.of( - Organization.class, - PublisherAsset.class - ) - ); + addRequiredEntities(Set.of(Proceedings.class)); } @Override 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 034c274..2d679b0 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 @@ -2,6 +2,9 @@ package org.scientificcms.publications.contenttypes; import org.libreccm.imexport.Processes; import org.librecms.contentsection.AbstractContentItemImExporter; +import org.scientificcms.publications.Talk; + +import java.util.Set; import javax.enterprise.context.RequestScoped; @@ -21,7 +24,7 @@ public class TalkItemImExporter @Override protected void initContentItemImExporter() { - // Nothing + addRequiredEntities(Set.of(Talk.class)); } } 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 73fa6b7..b5c44e6 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 @@ -1,8 +1,8 @@ package org.scientificcms.publications.contenttypes; import org.libreccm.imexport.Processes; -import org.librecms.assets.Organization; import org.librecms.contentsection.AbstractContentItemImExporter; +import org.scientificcms.publications.WorkingPaper; import java.util.Set; @@ -19,11 +19,7 @@ public class WorkingPaperItemImExporter @Override protected void initContentItemImExporter() { - addRequiredEntities( - Set.of( - Organization.class - ) - ); + addRequiredEntities(Set.of(WorkingPaper.class)); } @Override