From 61f2810fcc6a9cd228a8fe610fec83f3060b8d04 Mon Sep 17 00:00:00 2001 From: Thomas Georgios Giannos Date: Mon, 23 Oct 2023 11:31:07 +0300 Subject: [PATCH] Renamed DMP -> Dmp to be consistent with the other entities --- .../enums/{DMPStatus.java => DmpStatus.java} | 8 +- .../data/{DMPEntity.java => DmpEntity.java} | 10 +- .../converters/enums/DMPStatusConverter.java | 14 -- .../converters/enums/DmpStatusConverter.java | 14 ++ .../eu/eudat/model/{DMP.java => Dmp.java} | 10 +- .../{DMPBuilder.java => DmpBuilder.java} | 52 ++++---- .../{DMPCensor.java => DmpCensor.java} | 2 +- .../{DMPDeleter.java => DmpDeleter.java} | 2 +- .../{DMPPersist.java => DmpPersist.java} | 2 +- .../query/{DMPQueryV2.java => DmpQuery.java} | 120 +++++++++--------- .../lookup/{DMPLookup.java => DmpLookup.java} | 2 +- .../eu/eudat/service/dmp/DMPServiceImpl.java | 5 - .../dmp/{DMPService.java => DmpService.java} | 2 +- .../eu/eudat/service/dmp/DmpServiceImpl.java | 5 + 14 files changed, 124 insertions(+), 124 deletions(-) rename dmp-backend/core/src/main/java/eu/eudat/commons/enums/{DMPStatus.java => DmpStatus.java} (61%) rename dmp-backend/core/src/main/java/eu/eudat/data/{DMPEntity.java => DmpEntity.java} (97%) delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/data/converters/enums/DMPStatusConverter.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/data/converters/enums/DmpStatusConverter.java rename dmp-backend/core/src/main/java/eu/eudat/model/{DMP.java => Dmp.java} (96%) rename dmp-backend/core/src/main/java/eu/eudat/model/builder/{DMPBuilder.java => DmpBuilder.java} (58%) rename dmp-backend/core/src/main/java/eu/eudat/model/censorship/{DMPCensor.java => DmpCensor.java} (60%) rename dmp-backend/core/src/main/java/eu/eudat/model/deleter/{DMPDeleter.java => DmpDeleter.java} (58%) rename dmp-backend/core/src/main/java/eu/eudat/model/persist/{DMPPersist.java => DmpPersist.java} (58%) rename dmp-backend/core/src/main/java/eu/eudat/query/{DMPQueryV2.java => DmpQuery.java} (57%) rename dmp-backend/core/src/main/java/eu/eudat/query/lookup/{DMPLookup.java => DmpLookup.java} (58%) delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/dmp/DMPServiceImpl.java rename dmp-backend/core/src/main/java/eu/eudat/service/dmp/{DMPService.java => DmpService.java} (53%) create mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/DMPStatus.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/DmpStatus.java similarity index 61% rename from dmp-backend/core/src/main/java/eu/eudat/commons/enums/DMPStatus.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/enums/DmpStatus.java index 7fe183aad..2c4d4d4bb 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/DMPStatus.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/DmpStatus.java @@ -4,13 +4,13 @@ import eu.eudat.data.converters.enums.DatabaseEnum; import java.util.Map; -public enum DMPStatus implements DatabaseEnum { +public enum DmpStatus implements DatabaseEnum { ACTIVE((short) 0), FINALISED((short) 1),DELETED((short) 99); private final Short value; - DMPStatus(Short value) { + DmpStatus(Short value) { this.value = value; } @@ -19,9 +19,9 @@ public enum DMPStatus implements DatabaseEnum { return null; } - private static final Map map = EnumUtils.getEnumValueMap(DMPStatus.class); + private static final Map map = EnumUtils.getEnumValueMap(DmpStatus.class); - public static DMPStatus of(Short i) { + public static DmpStatus of(Short i) { return map.get(i); } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DMPEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java similarity index 97% rename from dmp-backend/core/src/main/java/eu/eudat/data/DMPEntity.java rename to dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java index ae3b10bb1..3cab2aa14 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DMPEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java @@ -1,6 +1,6 @@ package eu.eudat.data; -import eu.eudat.commons.enums.DMPStatus; +import eu.eudat.commons.enums.DmpStatus; import eu.eudat.commons.enums.IsActive; import eu.eudat.data.converters.DateToUTCConverter; import eu.eudat.data.converters.enums.IsActiveConverter; @@ -13,7 +13,7 @@ import java.util.UUID; //TODO: (thgiannos) Wire up when all other dependent entities are refactored //@Entity //@Table(name = "\"DMP\"") -public class DMPEntity { +public class DmpEntity { @Id @GeneratedValue @@ -35,7 +35,7 @@ public class DMPEntity { @Enumerated(EnumType.STRING) @Column(name = "status", nullable = false) - private DMPStatus status; + private DmpStatus status; public static final String _status = "status"; @@ -182,11 +182,11 @@ public class DMPEntity { this.version = version; } - public DMPStatus getStatus() { + public DmpStatus getStatus() { return status; } - public void setStatus(DMPStatus status) { + public void setStatus(DmpStatus status) { this.status = status; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/converters/enums/DMPStatusConverter.java b/dmp-backend/core/src/main/java/eu/eudat/data/converters/enums/DMPStatusConverter.java deleted file mode 100644 index e55a52728..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/data/converters/enums/DMPStatusConverter.java +++ /dev/null @@ -1,14 +0,0 @@ -package eu.eudat.data.converters.enums; - -import eu.eudat.commons.enums.DMPStatus; -import jakarta.persistence.Converter; - -@Converter -public class DMPStatusConverter extends DatabaseEnumConverter { - - @Override - protected DMPStatus of(Short i) { - return DMPStatus.of(i); - } - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/converters/enums/DmpStatusConverter.java b/dmp-backend/core/src/main/java/eu/eudat/data/converters/enums/DmpStatusConverter.java new file mode 100644 index 000000000..24244da5c --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/data/converters/enums/DmpStatusConverter.java @@ -0,0 +1,14 @@ +package eu.eudat.data.converters.enums; + +import eu.eudat.commons.enums.DmpStatus; +import jakarta.persistence.Converter; + +@Converter +public class DmpStatusConverter extends DatabaseEnumConverter { + + @Override + protected DmpStatus of(Short i) { + return DmpStatus.of(i); + } + +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/DMP.java b/dmp-backend/core/src/main/java/eu/eudat/model/Dmp.java similarity index 96% rename from dmp-backend/core/src/main/java/eu/eudat/model/DMP.java rename to dmp-backend/core/src/main/java/eu/eudat/model/Dmp.java index fdb2e4291..071ec7060 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/DMP.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/Dmp.java @@ -1,12 +1,12 @@ package eu.eudat.model; -import eu.eudat.commons.enums.DMPStatus; +import eu.eudat.commons.enums.DmpStatus; import eu.eudat.commons.enums.IsActive; import java.time.Instant; import java.util.UUID; -public class DMP { +public class Dmp { private UUID id; @@ -20,7 +20,7 @@ public class DMP { public static final String _version = "version"; - private DMPStatus status; + private DmpStatus status; public static final String _status = "status"; @@ -112,11 +112,11 @@ public class DMP { this.version = version; } - public DMPStatus getStatus() { + public DmpStatus getStatus() { return status; } - public void setStatus(DMPStatus status) { + public void setStatus(DmpStatus status) { this.status = status; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/DMPBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBuilder.java similarity index 58% rename from dmp-backend/core/src/main/java/eu/eudat/model/builder/DMPBuilder.java rename to dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBuilder.java index 915334faa..d26a359ff 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/DMPBuilder.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBuilder.java @@ -2,8 +2,8 @@ package eu.eudat.model.builder; import eu.eudat.authorization.AuthorizationFlags; import eu.eudat.convention.ConventionService; -import eu.eudat.data.DMPEntity; -import eu.eudat.model.DMP; +import eu.eudat.data.DmpEntity; +import eu.eudat.model.Dmp; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.logging.DataLogEntry; @@ -18,45 +18,45 @@ import java.util.*; @Component @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) -public class DMPBuilder extends BaseBuilder { +public class DmpBuilder extends BaseBuilder { private EnumSet authorize = EnumSet.of(AuthorizationFlags.None); @Autowired - public DMPBuilder(ConventionService conventionService) { - super(conventionService, new LoggerService(LoggerFactory.getLogger(DMPBuilder.class))); + public DmpBuilder(ConventionService conventionService) { + super(conventionService, new LoggerService(LoggerFactory.getLogger(DmpBuilder.class))); } - public DMPBuilder authorize(EnumSet values) { + public DmpBuilder authorize(EnumSet values) { this.authorize = values; return this; } @Override - public List build(FieldSet fields, List data) throws MyApplicationException { + public List build(FieldSet fields, List data) throws MyApplicationException { this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0)); this.logger.trace(new DataLogEntry("requested fields", fields)); if (fields == null || data == null || fields.isEmpty()) return new ArrayList<>(); - List models = new ArrayList<>(); - for (DMPEntity d : data) { - DMP m = new DMP(); - if (fields.hasField(this.asIndexer(DMP._id))) m.setId(d.getId()); - if (fields.hasField(this.asIndexer(DMP._label))) m.setLabel(d.getLabel()); - if (fields.hasField(this.asIndexer(DMP._version))) m.setVersion(d.getVersion()); - if (fields.hasField(this.asIndexer(DMP._status))) m.setStatus(d.getStatus()); - if (fields.hasField(this.asIndexer(DMP._properties))) m.setProperties(d.getProperties()); - if (fields.hasField(this.asIndexer(DMP._dmpProperties))) m.setDmpProperties(d.getDmpProperties()); - if (fields.hasField(this.asIndexer(DMP._groupId))) m.setGroupId(d.getGroupId()); - if (fields.hasField(this.asIndexer(DMP._description))) m.setDescription(d.getDescription()); - if (fields.hasField(this.asIndexer(DMP._isPublic))) m.setIsPublic(d.getIsPublic()); - if (fields.hasField(this.asIndexer(DMP._extraProperties))) m.setExtraProperties(d.getExtraProperties()); - if (fields.hasField(this.asIndexer(DMP._createdAt))) m.setCreatedAt(d.getCreatedAt()); - if (fields.hasField(this.asIndexer(DMP._updatedAt))) m.setUpdatedAt(d.getUpdatedAt()); - if (fields.hasField(this.asIndexer(DMP._isActive))) m.setIsActive(d.getIsActive()); - if (fields.hasField(this.asIndexer(DMP._finalizedAt))) m.setFinalizedAt(d.getFinalizedAt()); - if (fields.hasField(this.asIndexer(DMP._publishedAt))) m.setPublishedAt(d.getPublishedAt()); - if (fields.hasField(this.asIndexer(DMP._hash))) m.setHash(this.hashValue(d.getUpdatedAt())); + List models = new ArrayList<>(); + for (DmpEntity d : data) { + Dmp m = new Dmp(); + if (fields.hasField(this.asIndexer(Dmp._id))) m.setId(d.getId()); + if (fields.hasField(this.asIndexer(Dmp._label))) m.setLabel(d.getLabel()); + if (fields.hasField(this.asIndexer(Dmp._version))) m.setVersion(d.getVersion()); + if (fields.hasField(this.asIndexer(Dmp._status))) m.setStatus(d.getStatus()); + if (fields.hasField(this.asIndexer(Dmp._properties))) m.setProperties(d.getProperties()); + if (fields.hasField(this.asIndexer(Dmp._dmpProperties))) m.setDmpProperties(d.getDmpProperties()); + if (fields.hasField(this.asIndexer(Dmp._groupId))) m.setGroupId(d.getGroupId()); + if (fields.hasField(this.asIndexer(Dmp._description))) m.setDescription(d.getDescription()); + if (fields.hasField(this.asIndexer(Dmp._isPublic))) m.setIsPublic(d.getIsPublic()); + if (fields.hasField(this.asIndexer(Dmp._extraProperties))) m.setExtraProperties(d.getExtraProperties()); + if (fields.hasField(this.asIndexer(Dmp._createdAt))) m.setCreatedAt(d.getCreatedAt()); + if (fields.hasField(this.asIndexer(Dmp._updatedAt))) m.setUpdatedAt(d.getUpdatedAt()); + if (fields.hasField(this.asIndexer(Dmp._isActive))) m.setIsActive(d.getIsActive()); + if (fields.hasField(this.asIndexer(Dmp._finalizedAt))) m.setFinalizedAt(d.getFinalizedAt()); + if (fields.hasField(this.asIndexer(Dmp._publishedAt))) m.setPublishedAt(d.getPublishedAt()); + if (fields.hasField(this.asIndexer(Dmp._hash))) m.setHash(this.hashValue(d.getUpdatedAt())); models.add(m); } this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0)); diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/DMPCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/DmpCensor.java similarity index 60% rename from dmp-backend/core/src/main/java/eu/eudat/model/censorship/DMPCensor.java rename to dmp-backend/core/src/main/java/eu/eudat/model/censorship/DmpCensor.java index 03a0377bb..2fb1ed104 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/DMPCensor.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/DmpCensor.java @@ -1,5 +1,5 @@ package eu.eudat.model.censorship; -public class DMPCensor { +public class DmpCensor { } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/deleter/DMPDeleter.java b/dmp-backend/core/src/main/java/eu/eudat/model/deleter/DmpDeleter.java similarity index 58% rename from dmp-backend/core/src/main/java/eu/eudat/model/deleter/DMPDeleter.java rename to dmp-backend/core/src/main/java/eu/eudat/model/deleter/DmpDeleter.java index a328d55a5..bcc1067ad 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/deleter/DMPDeleter.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/deleter/DmpDeleter.java @@ -1,5 +1,5 @@ package eu.eudat.model.deleter; -public class DMPDeleter { +public class DmpDeleter { } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DMPPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpPersist.java similarity index 58% rename from dmp-backend/core/src/main/java/eu/eudat/model/persist/DMPPersist.java rename to dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpPersist.java index 8094758b8..4ddc19eb3 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DMPPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DmpPersist.java @@ -1,5 +1,5 @@ package eu.eudat.model.persist; -public class DMPPersist { +public class DmpPersist { } diff --git a/dmp-backend/core/src/main/java/eu/eudat/query/DMPQueryV2.java b/dmp-backend/core/src/main/java/eu/eudat/query/DmpQuery.java similarity index 57% rename from dmp-backend/core/src/main/java/eu/eudat/query/DMPQueryV2.java rename to dmp-backend/core/src/main/java/eu/eudat/query/DmpQuery.java index 3ab189088..415d9d58e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/query/DMPQueryV2.java +++ b/dmp-backend/core/src/main/java/eu/eudat/query/DmpQuery.java @@ -1,11 +1,11 @@ package eu.eudat.query; import eu.eudat.authorization.AuthorizationFlags; -import eu.eudat.commons.enums.DMPStatus; +import eu.eudat.commons.enums.DmpStatus; import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.scope.user.UserScope; -import eu.eudat.data.DMPEntity; -import eu.eudat.model.DMP; +import eu.eudat.data.DmpEntity; +import eu.eudat.model.Dmp; import gr.cite.commons.web.authz.service.AuthorizationService; import gr.cite.tools.data.query.FieldResolver; import gr.cite.tools.data.query.QueryBase; @@ -22,7 +22,7 @@ import java.util.*; @Component @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) -public class DMPQueryV2 extends QueryBase { +public class DmpQuery extends QueryBase { private String like; @@ -30,7 +30,7 @@ public class DMPQueryV2 extends QueryBase { private Collection isActives; - private Collection statuses; + private Collection statuses; private Collection excludedIds; @@ -40,77 +40,77 @@ public class DMPQueryV2 extends QueryBase { private final AuthorizationService authService; - public DMPQueryV2(UserScope userScope, AuthorizationService authService) { + public DmpQuery(UserScope userScope, AuthorizationService authService) { this.userScope = userScope; this.authService = authService; } - public DMPQueryV2 like(String value) { + public DmpQuery like(String value) { this.like = value; return this; } - public DMPQueryV2 ids(UUID value) { + public DmpQuery ids(UUID value) { this.ids = List.of(value); return this; } - public DMPQueryV2 ids(UUID... value) { + public DmpQuery ids(UUID... value) { this.ids = Arrays.asList(value); return this; } - public DMPQueryV2 ids(Collection values) { + public DmpQuery ids(Collection values) { this.ids = values; return this; } - public DMPQueryV2 isActive(IsActive value) { + public DmpQuery isActive(IsActive value) { this.isActives = List.of(value); return this; } - public DMPQueryV2 isActive(IsActive... value) { + public DmpQuery isActive(IsActive... value) { this.isActives = Arrays.asList(value); return this; } - public DMPQueryV2 isActive(Collection values) { + public DmpQuery isActive(Collection values) { this.isActives = values; return this; } - public DMPQueryV2 statuses(DMPStatus value) { + public DmpQuery statuses(DmpStatus value) { this.statuses = List.of(value); return this; } - public DMPQueryV2 statuses(DMPStatus... value) { + public DmpQuery statuses(DmpStatus... value) { this.statuses = Arrays.asList(value); return this; } - public DMPQueryV2 statuses(Collection values) { + public DmpQuery statuses(Collection values) { this.statuses = values; return this; } - public DMPQueryV2 excludedIds(Collection values) { + public DmpQuery excludedIds(Collection values) { this.excludedIds = values; return this; } - public DMPQueryV2 excludedIds(UUID value) { + public DmpQuery excludedIds(UUID value) { this.excludedIds = List.of(value); return this; } - public DMPQueryV2 excludedIds(UUID... value) { + public DmpQuery excludedIds(UUID... value) { this.excludedIds = Arrays.asList(value); return this; } - public DMPQueryV2 authorize(EnumSet values) { + public DmpQuery authorize(EnumSet values) { this.authorize = values; return this; } @@ -121,37 +121,37 @@ public class DMPQueryV2 extends QueryBase { } @Override - protected Class entityClass() { - return DMPEntity.class; + protected Class entityClass() { + return DmpEntity.class; } @Override protected Predicate applyFilters(QueryContext queryContext) { List predicates = new ArrayList<>(); if (this.ids != null) { - CriteriaBuilder.In inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DMPEntity._id)); + CriteriaBuilder.In inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DmpEntity._id)); for (UUID item : this.ids) inClause.value(item); predicates.add(inClause); } if (this.like != null && !this.like.isEmpty()) { - predicates.add(queryContext.CriteriaBuilder.like(queryContext.Root.get(DMPEntity._label), this.like)); + predicates.add(queryContext.CriteriaBuilder.like(queryContext.Root.get(DmpEntity._label), this.like)); } if (this.isActives != null) { - CriteriaBuilder.In inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DMPEntity._isActive)); + CriteriaBuilder.In inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DmpEntity._isActive)); for (IsActive item : this.isActives) inClause.value(item); predicates.add(inClause); } if (this.statuses != null) { - CriteriaBuilder.In inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DMPEntity._status)); - for (DMPStatus item : this.statuses) + CriteriaBuilder.In inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DmpEntity._status)); + for (DmpStatus item : this.statuses) inClause.value(item); predicates.add(inClause); } if (this.excludedIds != null) { - CriteriaBuilder.In notInClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DMPEntity._id)); + CriteriaBuilder.In notInClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DmpEntity._id)); for (UUID item : this.excludedIds) notInClause.value(item); predicates.add(notInClause.not()); @@ -166,42 +166,42 @@ public class DMPQueryV2 extends QueryBase { @Override protected String fieldNameOf(FieldResolver item) { - if (item.match(DMP._id)) return DMPEntity._id; - else if (item.match(DMP._label)) return DMPEntity._label; - else if (item.match(DMP._version)) return DMPEntity._version; - else if (item.match(DMP._status)) return DMPEntity._status; - else if (item.match(DMP._properties)) return DMPEntity._properties; - else if (item.match(DMP._dmpProperties)) return DMPEntity._dmpProperties; - else if (item.match(DMP._groupId)) return DMPEntity._groupId; - else if (item.match(DMP._description)) return DMPEntity._description; - else if (item.match(DMP._isPublic)) return DMPEntity._isPublic; - else if (item.match(DMP._extraProperties)) return DMPEntity._extraProperties; - else if (item.match(DMP._createdAt)) return DMPEntity._createdAt; - else if (item.match(DMP._updatedAt)) return DMPEntity._updatedAt; - else if (item.match(DMP._isActive)) return DMPEntity._isActive; - else if (item.match(DMP._finalizedAt)) return DMPEntity._finalizedAt; - else if (item.match(DMP._publishedAt)) return DMPEntity._publishedAt; + if (item.match(Dmp._id)) return DmpEntity._id; + else if (item.match(Dmp._label)) return DmpEntity._label; + else if (item.match(Dmp._version)) return DmpEntity._version; + else if (item.match(Dmp._status)) return DmpEntity._status; + else if (item.match(Dmp._properties)) return DmpEntity._properties; + else if (item.match(Dmp._dmpProperties)) return DmpEntity._dmpProperties; + else if (item.match(Dmp._groupId)) return DmpEntity._groupId; + else if (item.match(Dmp._description)) return DmpEntity._description; + else if (item.match(Dmp._isPublic)) return DmpEntity._isPublic; + else if (item.match(Dmp._extraProperties)) return DmpEntity._extraProperties; + else if (item.match(Dmp._createdAt)) return DmpEntity._createdAt; + else if (item.match(Dmp._updatedAt)) return DmpEntity._updatedAt; + else if (item.match(Dmp._isActive)) return DmpEntity._isActive; + else if (item.match(Dmp._finalizedAt)) return DmpEntity._finalizedAt; + else if (item.match(Dmp._publishedAt)) return DmpEntity._publishedAt; else return null; } @Override - protected DMPEntity convert(Tuple tuple, Set columns) { - DMPEntity item = new DMPEntity(); - item.setId(QueryBase.convertSafe(tuple, columns, DMPEntity._id, UUID.class)); - item.setLabel(QueryBase.convertSafe(tuple, columns, DMPEntity._label, String.class)); - item.setVersion(QueryBase.convertSafe(tuple, columns, DMPEntity._version, Integer.class)); - item.setStatus(QueryBase.convertSafe(tuple, columns, DMPEntity._status, DMPStatus.class)); - item.setProperties(QueryBase.convertSafe(tuple, columns, DMPEntity._properties, String.class)); - item.setDmpProperties(QueryBase.convertSafe(tuple, columns, DMPEntity._dmpProperties, String.class)); - item.setGroupId(QueryBase.convertSafe(tuple, columns, DMPEntity._groupId, UUID.class)); - item.setDescription(QueryBase.convertSafe(tuple, columns, DMPEntity._description, String.class)); - item.setIsPublic(QueryBase.convertSafe(tuple, columns, DMPEntity._isPublic, Boolean.class)); - item.setExtraProperties(QueryBase.convertSafe(tuple, columns, DMPEntity._extraProperties, String.class)); - item.setCreatedAt(QueryBase.convertSafe(tuple, columns, DMPEntity._createdAt, Instant.class)); - item.setUpdatedAt(QueryBase.convertSafe(tuple, columns, DMPEntity._updatedAt, Instant.class)); - item.setIsActive(QueryBase.convertSafe(tuple, columns, DMPEntity._isActive, IsActive.class)); - item.setFinalizedAt(QueryBase.convertSafe(tuple, columns, DMPEntity._finalizedAt, Instant.class)); - item.setPublishedAt(QueryBase.convertSafe(tuple, columns, DMPEntity._publishedAt, Instant.class)); + protected DmpEntity convert(Tuple tuple, Set columns) { + DmpEntity item = new DmpEntity(); + item.setId(QueryBase.convertSafe(tuple, columns, DmpEntity._id, UUID.class)); + item.setLabel(QueryBase.convertSafe(tuple, columns, DmpEntity._label, String.class)); + item.setVersion(QueryBase.convertSafe(tuple, columns, DmpEntity._version, Integer.class)); + item.setStatus(QueryBase.convertSafe(tuple, columns, DmpEntity._status, DmpStatus.class)); + item.setProperties(QueryBase.convertSafe(tuple, columns, DmpEntity._properties, String.class)); + item.setDmpProperties(QueryBase.convertSafe(tuple, columns, DmpEntity._dmpProperties, String.class)); + item.setGroupId(QueryBase.convertSafe(tuple, columns, DmpEntity._groupId, UUID.class)); + item.setDescription(QueryBase.convertSafe(tuple, columns, DmpEntity._description, String.class)); + item.setIsPublic(QueryBase.convertSafe(tuple, columns, DmpEntity._isPublic, Boolean.class)); + item.setExtraProperties(QueryBase.convertSafe(tuple, columns, DmpEntity._extraProperties, String.class)); + item.setCreatedAt(QueryBase.convertSafe(tuple, columns, DmpEntity._createdAt, Instant.class)); + item.setUpdatedAt(QueryBase.convertSafe(tuple, columns, DmpEntity._updatedAt, Instant.class)); + item.setIsActive(QueryBase.convertSafe(tuple, columns, DmpEntity._isActive, IsActive.class)); + item.setFinalizedAt(QueryBase.convertSafe(tuple, columns, DmpEntity._finalizedAt, Instant.class)); + item.setPublishedAt(QueryBase.convertSafe(tuple, columns, DmpEntity._publishedAt, Instant.class)); return item; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DMPLookup.java b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DmpLookup.java similarity index 58% rename from dmp-backend/core/src/main/java/eu/eudat/query/lookup/DMPLookup.java rename to dmp-backend/core/src/main/java/eu/eudat/query/lookup/DmpLookup.java index 74b1202e1..fd1a711c6 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DMPLookup.java +++ b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DmpLookup.java @@ -1,5 +1,5 @@ package eu.eudat.query.lookup; -public class DMPLookup { +public class DmpLookup { } diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DMPServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DMPServiceImpl.java deleted file mode 100644 index a11185a29..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DMPServiceImpl.java +++ /dev/null @@ -1,5 +0,0 @@ -package eu.eudat.service.dmp; - -public class DMPServiceImpl implements DMPService { - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DMPService.java b/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpService.java similarity index 53% rename from dmp-backend/core/src/main/java/eu/eudat/service/dmp/DMPService.java rename to dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpService.java index eff3f53d0..fc97e308d 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DMPService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpService.java @@ -1,5 +1,5 @@ package eu.eudat.service.dmp; -public interface DMPService { +public interface DmpService { } diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java new file mode 100644 index 000000000..653853f59 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java @@ -0,0 +1,5 @@ +package eu.eudat.service.dmp; + +public class DmpServiceImpl implements DmpService { + +}