diff --git a/redaction-service-v1/pom.xml b/redaction-service-v1/pom.xml index 8d6b6355..3cdcd5b2 100644 --- a/redaction-service-v1/pom.xml +++ b/redaction-service-v1/pom.xml @@ -5,7 +5,7 @@ platform-dependency com.iqser.red - 1.17.0 + 2.2.0 4.0.0 @@ -23,7 +23,6 @@ 2.0.24 - 1.9.9 @@ -32,7 +31,7 @@ com.iqser.red platform-commons-dependency - 1.22.0 + 2.1.0 import pom diff --git a/redaction-service-v1/redaction-service-api-v1/pom.xml b/redaction-service-v1/redaction-service-api-v1/pom.xml index 273ed3f8..82969479 100644 --- a/redaction-service-v1/redaction-service-api-v1/pom.xml +++ b/redaction-service-v1/redaction-service-api-v1/pom.xml @@ -17,13 +17,6 @@ - - - com.dslplatform - dsl-json-java8 - ${dsljson.version} - - org.springframework spring-web @@ -55,10 +48,13 @@ org.apache.maven.plugins maven-compiler-plugin - - lombok.launch.AnnotationProcessorHider$AnnotationProcessor - com.dslplatform.json.processor.CompiledJsonAnnotationProcessor - + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/redaction-service-v1/redaction-service-server-v1/pom.xml b/redaction-service-v1/redaction-service-server-v1/pom.xml index 41036d0f..27bca733 100644 --- a/redaction-service-v1/redaction-service-server-v1/pom.xml +++ b/redaction-service-v1/redaction-service-server-v1/pom.xml @@ -14,10 +14,10 @@ 7.73.0.Final 7.73.0.Final - 1.18.2 - 3.28.0-GA + 1.19.0 + 3.29.2-GA 0.6.3 - 2.13.2 + 2.14.2 @@ -30,6 +30,7 @@ com.iqser.red.commons storage-commons + 2.1.0 @@ -93,7 +94,6 @@ com.iqser.red.commons metric-commons - 1.7.0 @@ -135,10 +135,13 @@ org.apache.maven.plugins maven-compiler-plugin - - lombok.launch.AnnotationProcessorHider$AnnotationProcessor - com.dslplatform.json.processor.CompiledJsonAnnotationProcessor - + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Footer.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Footer.java index 3df94fbc..d428bcfa 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Footer.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Footer.java @@ -1,6 +1,5 @@ package com.iqser.red.service.redaction.v1.server.classification.model; -import com.dslplatform.json.JsonAttribute; import com.fasterxml.jackson.annotation.JsonIgnore; import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText; @@ -17,7 +16,6 @@ public class Footer { @JsonIgnore - @JsonAttribute(ignore = true) public SearchableText getSearchableText() { SearchableText searchableText = new SearchableText(); diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Header.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Header.java index 8dfaed9f..90244010 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Header.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Header.java @@ -1,6 +1,5 @@ package com.iqser.red.service.redaction.v1.server.classification.model; -import com.dslplatform.json.JsonAttribute; import com.fasterxml.jackson.annotation.JsonIgnore; import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText; @@ -17,7 +16,6 @@ public class Header { @JsonIgnore - @JsonAttribute(ignore = true) public SearchableText getSearchableText() { SearchableText searchableText = new SearchableText(); diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SectionText.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SectionText.java index aeb35168..e3073231 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SectionText.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SectionText.java @@ -1,7 +1,12 @@ package com.iqser.red.service.redaction.v1.server.classification.model; -import com.dslplatform.json.CompiledJson; -import com.dslplatform.json.JsonAttribute; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionArea; import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue; @@ -13,11 +18,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.*; - @Data @Builder -@CompiledJson @NoArgsConstructor @AllArgsConstructor public class SectionText { @@ -48,7 +50,6 @@ public class SectionText { @JsonIgnore - @JsonAttribute(ignore = true) public SearchableText getSearchableText() { SearchableText searchableText = new SearchableText(); diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SimplifiedSectionText.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SimplifiedSectionText.java index 52929d62..58b11aae 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SimplifiedSectionText.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SimplifiedSectionText.java @@ -1,6 +1,5 @@ package com.iqser.red.service.redaction.v1.server.classification.model; -import com.dslplatform.json.CompiledJson; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,7 +8,6 @@ import lombok.NoArgsConstructor; @Data @Builder -@CompiledJson @NoArgsConstructor @AllArgsConstructor public class SimplifiedSectionText { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SimplifiedText.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SimplifiedText.java index 534e7b7a..496d64ae 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SimplifiedText.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SimplifiedText.java @@ -3,8 +3,6 @@ package com.iqser.red.service.redaction.v1.server.classification.model; import java.util.ArrayList; import java.util.List; -import com.dslplatform.json.CompiledJson; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,7 +10,6 @@ import lombok.NoArgsConstructor; @Data @Builder -@CompiledJson @NoArgsConstructor @AllArgsConstructor public class SimplifiedText { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Text.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Text.java index ddbd5ee8..ce0f8824 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Text.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Text.java @@ -1,6 +1,5 @@ package com.iqser.red.service.redaction.v1.server.classification.model; -import com.dslplatform.json.CompiledJson; import lombok.AllArgsConstructor; import lombok.Data; @@ -10,7 +9,6 @@ import java.util.ArrayList; import java.util.List; @Data -@CompiledJson @NoArgsConstructor @AllArgsConstructor public class Text { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/TextBlock.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/TextBlock.java index 436fd7e5..3061541b 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/TextBlock.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/TextBlock.java @@ -3,8 +3,6 @@ package com.iqser.red.service.redaction.v1.server.classification.model; import java.util.ArrayList; import java.util.List; -import com.dslplatform.json.CompiledJson; -import com.dslplatform.json.JsonAttribute; import com.fasterxml.jackson.annotation.JsonIgnore; import com.iqser.red.service.redaction.v1.server.parsing.model.TextDirection; import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence; @@ -19,7 +17,6 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @Builder @Data -@CompiledJson @NoArgsConstructor public class TextBlock extends AbstractTextContainer { @@ -52,7 +49,6 @@ public class TextBlock extends AbstractTextContainer { @JsonIgnore - @JsonAttribute(ignore = true) public TextDirection getDir() { return sequences.get(0).getDir(); @@ -60,7 +56,6 @@ public class TextBlock extends AbstractTextContainer { @JsonIgnore - @JsonAttribute(ignore = true) private float getPageHeight() { return sequences.get(0).getPageHeight(); @@ -68,7 +63,6 @@ public class TextBlock extends AbstractTextContainer { @JsonIgnore - @JsonAttribute(ignore = true) private float getPageWidth() { return sequences.get(0).getPageWidth(); @@ -86,7 +80,6 @@ public class TextBlock extends AbstractTextContainer { * @return the minX value in pdf coordinate system */ @JsonIgnore - @JsonAttribute(ignore = true) public float getPdfMinX() { if (getDir().getDegrees() == 90) { @@ -113,7 +106,6 @@ public class TextBlock extends AbstractTextContainer { * @return the maxX value in pdf coordinate system */ @JsonIgnore - @JsonAttribute(ignore = true) public float getPdfMaxX() { if (getDir().getDegrees() == 90) { @@ -140,7 +132,6 @@ public class TextBlock extends AbstractTextContainer { * @return the minY value in pdf coordinate system */ @JsonIgnore - @JsonAttribute(ignore = true) public float getPdfMinY() { if (getDir().getDegrees() == 90) { @@ -168,7 +159,6 @@ public class TextBlock extends AbstractTextContainer { * @return the maxY value in pdf coordinate system */ @JsonIgnore - @JsonAttribute(ignore = true) public float getPdfMaxY() { if (getDir().getDegrees() == 90) { @@ -288,7 +278,6 @@ public class TextBlock extends AbstractTextContainer { @Override @JsonIgnore - @JsonAttribute(ignore = true) public String getText() { StringBuilder sb = new StringBuilder(); diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/UnclassifiedText.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/UnclassifiedText.java index 3d53f093..ad56370f 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/UnclassifiedText.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/UnclassifiedText.java @@ -1,6 +1,5 @@ package com.iqser.red.service.redaction.v1.server.classification.model; -import com.dslplatform.json.JsonAttribute; import com.fasterxml.jackson.annotation.JsonIgnore; import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText; @@ -17,7 +16,6 @@ public class UnclassifiedText { @JsonIgnore - @JsonAttribute(ignore = true) public SearchableText getSearchableText() { SearchableText searchableText = new SearchableText(); diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecogintionEntity.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecogintionEntity.java index 84913f06..c7de7eda 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecogintionEntity.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecogintionEntity.java @@ -1,6 +1,5 @@ package com.iqser.red.service.redaction.v1.server.client.model; -import com.dslplatform.json.CompiledJson; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,7 +8,6 @@ import lombok.NoArgsConstructor; @Data @Builder -@CompiledJson @AllArgsConstructor @NoArgsConstructor public class EntityRecogintionEntity { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/NerEntities.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/NerEntities.java index 466cc3aa..356c343a 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/NerEntities.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/NerEntities.java @@ -4,14 +4,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.dslplatform.json.CompiledJson; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @Data -@CompiledJson @NoArgsConstructor @AllArgsConstructor public class NerEntities { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/multitenancy/EncryptionDecryptionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/multitenancy/EncryptionDecryptionService.java index 26d5acdd..c4f9064e 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/multitenancy/EncryptionDecryptionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/multitenancy/EncryptionDecryptionService.java @@ -6,7 +6,6 @@ import java.security.SecureRandom; import java.security.spec.KeySpec; import java.util.Base64; -import javax.annotation.PostConstruct; import javax.crypto.Cipher; import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; @@ -17,6 +16,7 @@ import javax.crypto.spec.SecretKeySpec; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import jakarta.annotation.PostConstruct; import lombok.SneakyThrows; @Service diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/RedTextPosition.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/RedTextPosition.java index 3054c99b..241900a1 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/RedTextPosition.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/RedTextPosition.java @@ -3,8 +3,6 @@ package com.iqser.red.service.redaction.v1.server.parsing.model; import org.apache.pdfbox.text.TextPosition; import org.springframework.beans.BeanUtils; -import com.dslplatform.json.CompiledJson; -import com.dslplatform.json.JsonAttribute; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; @@ -17,7 +15,6 @@ import lombok.SneakyThrows; @Builder @NoArgsConstructor @AllArgsConstructor -@CompiledJson public class RedTextPosition { private String textMatrix; @@ -39,17 +36,14 @@ public class RedTextPosition { // not used in reanalysis @JsonIgnore - @JsonAttribute(ignore = true) private float widthOfSpace; // not used in reanalysis @JsonIgnore - @JsonAttribute(ignore = true) private float fontSizeInPt; // not used in reanalysis @JsonIgnore - @JsonAttribute(ignore = true) private String fontName; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextDirection.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextDirection.java index 079a84e8..003eca70 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextDirection.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextDirection.java @@ -35,13 +35,6 @@ public enum TextDirection { } - @com.dslplatform.json.JsonValue - public float jsonValue() { - - return getDegrees(); - } - - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static TextDirection fromDegrees(float degrees) { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequence.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequence.java index e2a0febd..b1aecb99 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequence.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequence.java @@ -8,8 +8,6 @@ import java.util.stream.Collectors; import org.apache.pdfbox.text.TextPosition; -import com.dslplatform.json.CompiledJson; -import com.dslplatform.json.JsonAttribute; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point; @@ -25,7 +23,6 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Data @Builder -@CompiledJson @NoArgsConstructor @AllArgsConstructor @JsonIgnoreProperties({"empty"}) @@ -144,7 +141,6 @@ public class TextPositionSequence implements CharSequence { * @return the text direction adjusted minX value */ @JsonIgnore - @JsonAttribute(ignore = true) public float getMinXDirAdj() { return textPositions.get(0).getXDirAdj(); @@ -159,7 +155,6 @@ public class TextPositionSequence implements CharSequence { * @return the text direction adjusted maxX value */ @JsonIgnore - @JsonAttribute(ignore = true) public float getMaxXDirAdj() { return textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + HEIGHT_PADDING; @@ -174,7 +169,6 @@ public class TextPositionSequence implements CharSequence { * @return the text direction adjusted minY value. The upper border of the bounding box of the word. */ @JsonIgnore - @JsonAttribute(ignore = true) public float getMinYDirAdj() { return textPositions.get(0).getYDirAdj() - getTextHeight(); @@ -189,7 +183,6 @@ public class TextPositionSequence implements CharSequence { * @return the text direction adjusted maxY value. The lower border of the bounding box of the word. */ @JsonIgnore - @JsonAttribute(ignore = true) public float getMaxYDirAdj() { return textPositions.get(0).getYDirAdj(); @@ -198,7 +191,6 @@ public class TextPositionSequence implements CharSequence { @JsonIgnore - @JsonAttribute(ignore = true) public float getTextHeight() { return textPositions.get(0).getHeightDir() + HEIGHT_PADDING; @@ -206,7 +198,6 @@ public class TextPositionSequence implements CharSequence { @JsonIgnore - @JsonAttribute(ignore = true) public float getHeight() { return getMaxYDirAdj() - getMinYDirAdj(); @@ -214,7 +205,6 @@ public class TextPositionSequence implements CharSequence { @JsonIgnore - @JsonAttribute(ignore = true) public float getWidth() { return getMaxXDirAdj() - getMinXDirAdj(); @@ -222,7 +212,6 @@ public class TextPositionSequence implements CharSequence { @JsonIgnore - @JsonAttribute(ignore = true) public String getFont() { return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", ""); @@ -230,7 +219,6 @@ public class TextPositionSequence implements CharSequence { @JsonIgnore - @JsonAttribute(ignore = true) public String getFontStyle() { String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase(); @@ -249,7 +237,6 @@ public class TextPositionSequence implements CharSequence { @JsonIgnore - @JsonAttribute(ignore = true) public float getFontSize() { return textPositions.get(0).getFontSizeInPt(); @@ -257,7 +244,6 @@ public class TextPositionSequence implements CharSequence { @JsonIgnore - @JsonAttribute(ignore = true) public float getSpaceWidth() { return textPositions.get(0).getWidthOfSpace(); @@ -274,7 +260,6 @@ public class TextPositionSequence implements CharSequence { * @return bounding box of the word in Pdf Coordinate System */ @JsonIgnore - @JsonAttribute(ignore = true) @SneakyThrows public Rectangle getRectangle() { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Image.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Image.java index 71b5bddf..2f8adb1c 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Image.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Image.java @@ -1,6 +1,5 @@ package com.iqser.red.service.redaction.v1.server.redaction.model; -import com.dslplatform.json.CompiledJson; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,7 +8,6 @@ import lombok.NoArgsConstructor; @Data @Builder -@CompiledJson @NoArgsConstructor @AllArgsConstructor public class Image implements ReasonHolder { diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/RedRectangle2D.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/RedRectangle2D.java index 882f7188..df648776 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/RedRectangle2D.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/RedRectangle2D.java @@ -1,7 +1,5 @@ package com.iqser.red.service.redaction.v1.server.redaction.model; -import com.dslplatform.json.CompiledJson; -import com.dslplatform.json.JsonAttribute; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; @@ -11,7 +9,6 @@ import lombok.NoArgsConstructor; @Data @Builder -@CompiledJson @NoArgsConstructor @AllArgsConstructor public class RedRectangle2D { @@ -25,7 +22,6 @@ public class RedRectangle2D { @JsonIgnore - @JsonAttribute(ignore = true) public boolean isEmpty() { return width <= 0.0f || height <= 0.0f; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java index 82debd10..7565f367 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java @@ -1,6 +1,5 @@ package com.iqser.red.service.redaction.v1.server.redaction.model; -import com.dslplatform.json.JsonAttribute; import com.fasterxml.jackson.annotation.JsonIgnore; import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence; import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder; @@ -18,7 +17,6 @@ import lombok.Getter; public class SearchableText { @JsonIgnore - @JsonAttribute(ignore = true) private transient String stringRepresentation; @Getter private final List sequences = new ArrayList<>(); diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Classification.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Classification.java index 8961aa1a..3a63e8f5 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Classification.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Classification.java @@ -3,12 +3,10 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.image; import java.util.HashMap; import java.util.Map; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class Classification { private Map probabilities = new HashMap<>(); diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/FilterGeometry.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/FilterGeometry.java index 8f109fc3..da5221cc 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/FilterGeometry.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/FilterGeometry.java @@ -1,11 +1,9 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.image; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class FilterGeometry { private ImageSize imageSize; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Filters.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Filters.java index 072838ef..c752528d 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Filters.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Filters.java @@ -1,11 +1,9 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.image; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class Filters { private FilterGeometry geometry; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Geometry.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Geometry.java index cdd9e749..63a09756 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Geometry.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Geometry.java @@ -1,11 +1,9 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.image; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class Geometry { private float width; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageFormat.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageFormat.java index acafcb56..4f638825 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageFormat.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageFormat.java @@ -1,11 +1,9 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.image; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class ImageFormat { private float quotient; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageMetadata.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageMetadata.java index 0606c861..0c52b549 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageMetadata.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageMetadata.java @@ -1,11 +1,9 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.image; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class ImageMetadata { private Classification classification; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageServiceResponse.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageServiceResponse.java index 0fe141d7..1cb161ec 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageServiceResponse.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageServiceResponse.java @@ -1,7 +1,5 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.image; -import com.dslplatform.json.CompiledJson; -import com.dslplatform.json.JsonAttribute; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; @@ -11,7 +9,6 @@ import java.util.ArrayList; import java.util.List; @Data -@CompiledJson public class ImageServiceResponse { private String dossierId; @@ -19,7 +16,6 @@ public class ImageServiceResponse { @JsonProperty(value = "imageMetadata") @JsonAlias("data") - @JsonAttribute(alternativeNames = {"imageMetadata"}) private List data = new ArrayList<>(); private List dataCV = new ArrayList<>(); @@ -27,7 +23,6 @@ public class ImageServiceResponse { @JsonProperty(value = "imageMetadata") @JsonAlias("data") - @JsonAttribute(alternativeNames = {"imageMetadata"}) public void setData(List data) {this.data = data;} } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageSize.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageSize.java index e63d2bca..06c04440 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageSize.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/ImageSize.java @@ -1,11 +1,8 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.image; -import com.dslplatform.json.CompiledJson; - import lombok.Data; @Data -@CompiledJson public class ImageSize { private float quotient; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Position.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Position.java index fc7350c9..da12f50f 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Position.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Position.java @@ -1,11 +1,9 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.image; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class Position { private float x1; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Probability.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Probability.java index 990997a4..96a755c4 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Probability.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/image/Probability.java @@ -1,11 +1,9 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.image; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class Probability { private boolean unconfident; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/PageInfo.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/PageInfo.java index f2ec8d6b..7145f846 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/PageInfo.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/PageInfo.java @@ -1,11 +1,9 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.table; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class PageInfo { private int number; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableCells.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableCells.java index 00f0a138..7a67f0d0 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableCells.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableCells.java @@ -1,11 +1,9 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.table; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class TableCells { private float x0; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableData.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableData.java index ac5c01a9..cff0887c 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableData.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableData.java @@ -3,12 +3,10 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.table; import java.util.ArrayList; import java.util.List; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class TableData { private PageInfo pageInfo; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableServiceResponse.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableServiceResponse.java index df55d046..2cb9af4e 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableServiceResponse.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/table/TableServiceResponse.java @@ -3,12 +3,10 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.table; import java.util.ArrayList; import java.util.List; -import com.dslplatform.json.CompiledJson; import lombok.Data; @Data -@CompiledJson public class TableServiceResponse { private String dossierId; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java index f90750e3..f1667527 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java @@ -11,8 +11,6 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.SerializationUtils; import org.springframework.stereotype.Service; @@ -36,6 +34,7 @@ import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettin import feign.FeignException; import io.micrometer.core.annotation.Timed; +import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java index eaaa9b63..a4141d8c 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java @@ -7,8 +7,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; - import org.apache.commons.lang3.StringUtils; import org.kie.api.KieServices; import org.kie.api.builder.KieBuilder; @@ -29,6 +27,7 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.TenantRules; import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings; import io.micrometer.core.annotation.Timed; +import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/model/AbstractTextContainer.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/model/AbstractTextContainer.java index fa04e101..8c7e169d 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/model/AbstractTextContainer.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/model/AbstractTextContainer.java @@ -1,6 +1,5 @@ package com.iqser.red.service.redaction.v1.server.tableextraction.model; -import com.dslplatform.json.JsonAttribute; import com.fasterxml.jackson.annotation.JsonIgnore; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle; import com.iqser.red.service.redaction.v1.server.classification.model.Orientation; @@ -55,7 +54,6 @@ public abstract class AbstractTextContainer { @JsonIgnore - @JsonAttribute(ignore = true) public float getHeight() { return maxY - minY; @@ -63,7 +61,6 @@ public abstract class AbstractTextContainer { @JsonIgnore - @JsonAttribute(ignore = true) public float getWidth() { return maxX - minX; diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DictionaryServiceTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DictionaryServiceTest.java index fed7ce46..88a3a8cb 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DictionaryServiceTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DictionaryServiceTest.java @@ -18,7 +18,9 @@ import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -48,7 +50,7 @@ public class DictionaryServiceTest { protected DictionaryService dictionaryService; @Configuration - @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class}) + @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class}) public static class RedactionIntegrationTestConfiguration { @Bean diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/HeadlinesGoldStandardIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/HeadlinesGoldStandardIntegrationTest.java index bc0fe03d..20b897c1 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/HeadlinesGoldStandardIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/HeadlinesGoldStandardIntegrationTest.java @@ -37,7 +37,9 @@ import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.core.io.ClassPathResource; @@ -199,7 +201,8 @@ public class HeadlinesGoldStandardIntegrationTest { @Configuration - @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class}) + @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class/*, StorageAutoConfiguration.class*/}) + @ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=StorageAutoConfiguration.class)}) public static class RedactionIntegrationTestConfiguration { @Bean diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index b5b33dca..4e82d1dd 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -36,7 +36,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.core.io.ClassPathResource; @@ -81,8 +83,9 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest { private static final String RULES = loadFromClassPath("drools/rules.drl"); @Configuration - @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class}) - static class RedactionIntegrationTestConfiguration { + @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class}) + @ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=StorageAutoConfiguration.class)}) + public static class RedactionIntegrationTestConfiguration { @Bean public KieContainer kieContainer() { diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTestV2.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTestV2.java index b8f4d592..a1011fe0 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTestV2.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTestV2.java @@ -21,7 +21,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -46,7 +48,8 @@ public class RedactionIntegrationTestV2 extends AbstractRedactionIntegrationTest private static final String RULES = loadFromClassPath("drools/rules_v2.drl"); @Configuration - @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class}) + @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class}) + @ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=StorageAutoConfiguration.class)}) static class RedactionIntegrationTestConfiguration { @Bean diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java index d4d54446..cf33af60 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java @@ -46,7 +46,9 @@ import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.core.io.ClassPathResource; @@ -802,7 +804,8 @@ public class RulesTest { @Configuration - @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class}) + @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class}) + @ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=StorageAutoConfiguration.class)}) public static class RulesTestConfiguration { @Bean diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequenceTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequenceTest.java index 0db9d02b..8af50b39 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequenceTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequenceTest.java @@ -49,18 +49,6 @@ public class TextPositionSequenceTest { assertThat(textPositionSequence.getPageWidth()).isEqualTo(600f); } - - @Test - @SneakyThrows - public void testDeserializationWithDslJson() { - - TextPositionSequence textPositionSequence = objectSerializer.deserializeWithDslJson(new ByteArrayInputStream(TEXT_POSITION_SEQUENCE_AS_JSON.getBytes(StandardCharsets.UTF_8)), - TextPositionSequence.class); - - assertPropertiesAfterJsonDeserialization(textPositionSequence); - } - - private Matrix createIdentityMatrix() { return new Matrix(); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java index 070c25cb..3777bca5 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java @@ -19,10 +19,13 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; +import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.core.io.ClassPathResource; @@ -56,6 +59,7 @@ import lombok.SneakyThrows; @ExtendWith(SpringExtension.class) @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @Import(LiveDataIntegrationTest.RedactionIntegrationTestConfiguration.class) +@AutoConfigureObservability public class LiveDataIntegrationTest { protected static String BASE_DIR = "performance/"; @@ -98,7 +102,8 @@ public class LiveDataIntegrationTest { private List types; @Configuration - @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class}) + @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class}) + @ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=StorageAutoConfiguration.class)}) public static class RedactionIntegrationTestConfiguration { @Bean diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationServiceTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationServiceTest.java index 05df483c..5d414fca 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationServiceTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationServiceTest.java @@ -21,7 +21,9 @@ import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.core.io.ClassPathResource; @@ -89,7 +91,8 @@ public class PdfSegmentationServiceTest { private final static String TEST_FILE_ID = "123"; @Configuration - @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class}) + @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class}) + @ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=StorageAutoConfiguration.class)}) public static class TestConfiguration { @Bean