From 919825774d049d9f0228e493a944f1a903c4de5d Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Mon, 25 Sep 2023 16:39:12 +0200 Subject: [PATCH 1/2] DM-285: add containing Node to EntityLogEntry --- .../shared/model/analysislog/entitylog/EntityLogEntry.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/EntityLogEntry.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/EntityLogEntry.java index 82701b636..fc608f76a 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/EntityLogEntry.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/entitylog/EntityLogEntry.java @@ -32,12 +32,14 @@ public class EntityLogEntry { boolean imported; + List containingNodeId; + String closestHeadline; String section; + float[] color; @Builder.Default List positions = new ArrayList<>(); - int sectionNumber; String textBefore; String textAfter; -- 2.47.2 From e94d3c61461572130087b1c23b36126b2342ed4c Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Mon, 25 Sep 2023 17:10:02 +0200 Subject: [PATCH 2/2] DM-285: polish component log and component endpoints --- .../controller/ComponentLogController.java | 30 ++++++----- .../controller/ComponentControllerV2.java | 51 ++++++++++--------- .../v2/api/external/model/Component.java | 15 ++---- .../v2/api/external/model/ComponentValue.java | 30 +++++++++++ .../{Entity.java => EntityReference.java} | 10 ++-- .../v2/api/external/model/FileComponents.java | 15 +++--- .../service/ComponentLogService.java | 16 +++--- .../componentlog/ComponentLog.java | 2 +- ....java => ComponentLogEntityReference.java} | 2 +- ...{Component.java => ComponentLogEntry.java} | 4 +- ...Value.java => ComponentLogEntryValue.java} | 4 +- 11 files changed, 107 insertions(+), 72 deletions(-) create mode 100644 persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/ComponentValue.java rename persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/{Entity.java => EntityReference.java} (94%) rename persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/{EntityReference.java => ComponentLogEntityReference.java} (91%) rename persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/{Component.java => ComponentLogEntry.java} (82%) rename persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/{ComponentValue.java => ComponentLogEntryValue.java} (82%) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java index 17665a9a8..2cd4c45d1 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java @@ -17,9 +17,9 @@ import com.iqser.red.service.persistence.management.v1.processor.service.Compone import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService; import com.iqser.red.service.persistence.service.v1.api.external.resource.ComponentLogResource; import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory; -import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.Component; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLog; -import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentValue; +import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntry; +import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntryValue; import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentsOverrides; import com.iqser.red.service.persistence.service.v1.api.shared.model.component.RevertOverrideRequest; @@ -50,7 +50,7 @@ public class ComponentLogController implements ComponentLogResource { public void addOverrides(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody ComponentsOverrides componentsOverrides) { var componentLog = componentLogService.getComponentLog(dossierId, fileId); - var allComponents = componentLog.getComponents(); + var allComponents = componentLog.getComponentLogEntries(); componentOverrideService.addOverrides(dossierId, fileId, componentsOverrides); @@ -69,7 +69,7 @@ public class ComponentLogController implements ComponentLogResource { public void revertOverrides(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody RevertOverrideRequest revertOverrideRequest) { var componentLog = componentLogService.getComponentLog(dossierId, fileId); - var allComponents = componentLog.getComponents(); + var allComponents = componentLog.getComponentLogEntries(); componentOverrideService.revertOverrides(dossierId, fileId, revertOverrideRequest); @@ -77,9 +77,9 @@ public class ComponentLogController implements ComponentLogResource { } - private void auditOverride(String dossierId, String fileId, String componentName, String overrideValue, List allComponents) { + private void auditOverride(String dossierId, String fileId, String componentName, String overrideValue, List allComponentLogEntries) { - Optional component = allComponents.stream().filter(c -> c.getName().equals(componentName)).findFirst(); + Optional component = allComponentLogEntries.stream().filter(c -> c.getName().equals(componentName)).findFirst(); String originalValue = getOriginalValue(component); String value = getValue(component); auditPersistenceService.audit(AuditRequest.builder() @@ -105,9 +105,9 @@ public class ComponentLogController implements ComponentLogResource { } - private void auditOverrideRevert(String dossierId, String fileId, String componentNameToRevert, List allComponents) { + private void auditOverrideRevert(String dossierId, String fileId, String componentNameToRevert, List allComponentLogEntries) { - Optional component = allComponents.stream().filter(c -> c.getName().equals(componentNameToRevert)).findFirst(); + Optional component = allComponentLogEntries.stream().filter(c -> c.getName().equals(componentNameToRevert)).findFirst(); String originalValue = getOriginalValue(component); String value = getValue(component); auditPersistenceService.audit(AuditRequest.builder() @@ -133,17 +133,21 @@ public class ComponentLogController implements ComponentLogResource { } - private String getValue(Optional component) { + private String getValue(Optional component) { - return component.map(Component::getComponentValues).stream().map(a -> a.stream().map(ComponentValue::getValue).collect(Collectors.joining(", "))).findFirst().orElse(""); + return component.map(ComponentLogEntry::getComponentValues) + .stream() + .map(a -> a.stream().map(ComponentLogEntryValue::getValue).collect(Collectors.joining(", "))) + .findFirst() + .orElse(""); } - private static String getOriginalValue(Optional component) { + private static String getOriginalValue(Optional component) { - return component.map(Component::getComponentValues) + return component.map(ComponentLogEntry::getComponentValues) .stream() - .map(a -> a.stream().map(ComponentValue::getOriginalValue).collect(Collectors.joining(", "))) + .map(a -> a.stream().map(ComponentLogEntryValue::getOriginalValue).collect(Collectors.joining(", "))) .findFirst() .orElse(""); } diff --git a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/ComponentControllerV2.java b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/ComponentControllerV2.java index 94ac1a394..9b33861b0 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/ComponentControllerV2.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/ComponentControllerV2.java @@ -17,10 +17,12 @@ import org.springframework.web.bind.annotation.RestController; import com.iqser.red.persistence.service.v1.external.api.impl.controller.DossierTemplateController; import com.iqser.red.persistence.service.v1.external.api.impl.controller.StatusController; import com.iqser.red.service.persistence.management.v1.processor.service.ComponentLogService; -import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.Component; -import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentValue; -import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.EntityReference; -import com.iqser.red.service.persistence.service.v2.api.external.model.Entity; +import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntityReference; +import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntry; +import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntryValue; +import com.iqser.red.service.persistence.service.v2.api.external.model.Component; +import com.iqser.red.service.persistence.service.v2.api.external.model.ComponentValue; +import com.iqser.red.service.persistence.service.v2.api.external.model.EntityReference; import com.iqser.red.service.persistence.service.v2.api.external.model.FileComponents; import com.iqser.red.service.persistence.service.v2.api.external.model.FileComponentsList; import com.iqser.red.service.persistence.service.v2.api.external.resource.ComponentResource; @@ -48,14 +50,17 @@ public class ComponentControllerV2 implements ComponentResource { var componentLog = componentLogService.getComponentLog(dossierId, fileId, true); - Map> basicComponent = componentLog.getComponents() + Map> basicComponent = componentLog.getComponentLogEntries() .stream() - .collect(Collectors.toMap(Component::getName, component -> component.getComponentValues().stream().map(ComponentValue::getValue).toList())); + .collect(Collectors.toMap(ComponentLogEntry::getName, + componentLogEntry -> componentLogEntry.getComponentValues().stream().map(ComponentLogEntryValue::getValue).toList())); - Map> componentsDetails = Collections.emptyMap(); + Map componentsDetails = Collections.emptyMap(); if (includeDetails) { - componentsDetails = componentLog.getComponents().stream().collect(Collectors.toMap(Component::getName, this::toComponentList)); + componentsDetails = componentLog.getComponentLogEntries() + .stream() + .collect(Collectors.toMap(ComponentLogEntry::getName, entry -> Component.builder().name(entry.getName()).componentValues(toComponentList(entry)).build())); } return FileComponents.builder() @@ -68,31 +73,31 @@ public class ComponentControllerV2 implements ComponentResource { } - private List toComponentList(Component component) { + private List toComponentList(ComponentLogEntry componentLogEntry) { - return component.getComponentValues().stream().map(entry -> convert(entry, component.getName())).toList(); + return componentLogEntry.getComponentValues().stream().map(this::convert).toList(); } - private com.iqser.red.service.persistence.service.v2.api.external.model.Component convert(ComponentValue componentValue, String name) { + private ComponentValue convert(ComponentLogEntryValue componentValue) { - return com.iqser.red.service.persistence.service.v2.api.external.model.Component.builder() - .name(name) - .componentRule(componentValue.getComponentRuleId()) - .entityReferences(componentValue.getEntityReferences().stream().map(this::convertComponentEntityReference).toList()) - .originalValues(List.of(componentValue.getOriginalValue())) - .values(List.of(componentValue.getValue())) + return ComponentValue.builder() + .valueDescription(componentValue.getValueDescription()) + .componentRuleId(componentValue.getComponentRuleId()) + .entityReferences(componentValue.getComponentLogEntityReferences().stream().map(this::convertComponentEntityReference).toList()) + .originalValue(componentValue.getOriginalValue()) + .value(componentValue.getValue()) .build(); } - private Entity convertComponentEntityReference(EntityReference entityReference) { + private EntityReference convertComponentEntityReference(ComponentLogEntityReference componentLogEntityReference) { - return Entity.builder() - .id(entityReference.getId()) - .entityRule(entityReference.getEntityRuleId()) - .type(entityReference.getType()) - .pages(Set.of(entityReference.getPage())) + return EntityReference.builder() + .id(componentLogEntityReference.getId()) + .entityRule(componentLogEntityReference.getEntityRuleId()) + .type(componentLogEntityReference.getType()) + .pages(Set.of(componentLogEntityReference.getPage())) .build(); } diff --git a/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/Component.java b/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/Component.java index 19a12b744..d1646ac02 100644 --- a/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/Component.java +++ b/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/Component.java @@ -1,14 +1,14 @@ package com.iqser.red.service.persistence.service.v2.api.external.model; +import java.util.List; + import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.ArrayList; -import java.util.List; - @Data @Builder @NoArgsConstructor @@ -18,13 +18,6 @@ public class Component { @JacksonXmlCData private String name; @JacksonXmlCData - private List values; - @JacksonXmlCData - private List originalValues; - @JacksonXmlCData - private String componentRule; - - @Builder.Default - private List entityReferences = new ArrayList<>(); + private List componentValues; } diff --git a/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/ComponentValue.java b/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/ComponentValue.java new file mode 100644 index 000000000..7293b04a0 --- /dev/null +++ b/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/ComponentValue.java @@ -0,0 +1,30 @@ +package com.iqser.red.service.persistence.service.v2.api.external.model; + +import java.util.List; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ComponentValue { + + @JacksonXmlCData + String value; + @JacksonXmlCData + String originalValue; + @JacksonXmlCData + String valueDescription; + @JacksonXmlCData + String componentRuleId; + + @JacksonXmlCData + List entityReferences; + +} diff --git a/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/Entity.java b/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/EntityReference.java similarity index 94% rename from persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/Entity.java rename to persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/EntityReference.java index 963793d2a..3575d30a9 100644 --- a/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/Entity.java +++ b/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/EntityReference.java @@ -1,19 +1,20 @@ package com.iqser.red.service.persistence.service.v2.api.external.model; +import java.util.HashSet; +import java.util.Set; + import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.HashSet; -import java.util.Set; - @Data @Builder @NoArgsConstructor @AllArgsConstructor -public class Entity { +public class EntityReference { private String id; @JacksonXmlCData @@ -25,4 +26,5 @@ public class Entity { @Builder.Default private Set pages = new HashSet<>(); + } diff --git a/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/FileComponents.java b/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/FileComponents.java index 2fc3b69c6..1bb331b4c 100644 --- a/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/FileComponents.java +++ b/persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/FileComponents.java @@ -1,15 +1,16 @@ package com.iqser.red.service.persistence.service.v2.api.external.model; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - import java.util.HashMap; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlCData; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + @Data @Builder @NoArgsConstructor @@ -28,6 +29,6 @@ public class FileComponents { @Builder.Default @JacksonXmlCData - private Map> componentDetails = new HashMap<>(); + private Map componentDetails = new HashMap<>(); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ComponentLogService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ComponentLogService.java index ae997cda4..d225d8c1c 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ComponentLogService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ComponentLogService.java @@ -5,8 +5,8 @@ import java.util.Objects; import org.springframework.stereotype.Service; -import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.Component; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLog; +import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntry; import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentsOverrides; import lombok.RequiredArgsConstructor; @@ -31,12 +31,12 @@ public class ComponentLogService { return componentLog; } - List overriddenComponents = componentLog.getComponents() + List overriddenComponentLogEntries = componentLog.getComponentLogEntries() .stream() - .map(component -> applyOverride(component, componentsOverrides.getComponentOverrides().get(component.getName()))) + .map(componentLogEntry -> applyOverride(componentLogEntry, componentsOverrides.getComponentOverrides().get(componentLogEntry.getName()))) .toList(); - componentLog.setComponents(overriddenComponents); + componentLog.setComponentLogEntries(overriddenComponentLogEntries); return componentLog; } @@ -49,13 +49,13 @@ public class ComponentLogService { } - private Component applyOverride(Component component, String override) { + private ComponentLogEntry applyOverride(ComponentLogEntry componentLogEntry, String override) { if (Objects.isNull(override)) { - return component; + return componentLogEntry; } - component.getComponentValues().forEach(componentValue -> componentValue.setValue(override)); - return component; + componentLogEntry.getComponentValues().forEach(componentValue -> componentValue.setValue(override)); + return componentLogEntry; } } diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLog.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLog.java index 6afc3a1ef..7c437a6fa 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLog.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLog.java @@ -17,6 +17,6 @@ public class ComponentLog { int analysisNumber; long componentRulesVersion = -1; - List components = new ArrayList<>(); + List componentLogEntries = new ArrayList<>(); } diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/EntityReference.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntityReference.java similarity index 91% rename from persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/EntityReference.java rename to persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntityReference.java index 69ddf9b4a..d1e43a2a8 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/EntityReference.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntityReference.java @@ -12,7 +12,7 @@ import lombok.experimental.FieldDefaults; @AllArgsConstructor @NoArgsConstructor @FieldDefaults(level = AccessLevel.PRIVATE) -public class EntityReference { +public class ComponentLogEntityReference { String id; String type; diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/Component.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntry.java similarity index 82% rename from persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/Component.java rename to persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntry.java index b330e35c7..143bc55b1 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/Component.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntry.java @@ -12,9 +12,9 @@ import lombok.experimental.FieldDefaults; @AllArgsConstructor @NoArgsConstructor @FieldDefaults(level = AccessLevel.PRIVATE) -public class Component { +public class ComponentLogEntry { String name; - List componentValues; + List componentValues; } diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentValue.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntryValue.java similarity index 82% rename from persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentValue.java rename to persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntryValue.java index 07f66bb4e..04812f9a3 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentValue.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntryValue.java @@ -14,13 +14,13 @@ import lombok.experimental.FieldDefaults; @AllArgsConstructor @NoArgsConstructor @FieldDefaults(level = AccessLevel.PRIVATE) -public class ComponentValue { +public class ComponentLogEntryValue { String value; String originalValue; String valueDescription; String componentRuleId; - List entityReferences; + List componentLogEntityReferences; } -- 2.47.2