Pull request #530: RED-5694

Merge in RED/redaction-service from RED-5694 to master

* commit '7d4b3f40d3a09493459d6f71e53275fc1da7adad':
  RED-5694 - Upgrade spring-boot to 3.0 - exclude storageAutoConfiguration with @ComponentScan
  RED-5694 - Upgrade spring-boot to 3.0 - remove comment code
  RED-5694 - Upgrade spring-boot to 3.0 - remove comment code
  RED-5694 - Upgrade spring-boot to 3.0 - update exclusion of StorageAutoConfiguration
  RED-5694 - Upgrade spring-boot to 3.0 - update after the merge of master
  RED-5694 - Upgrade spring-boot to 3.0 - update platfrom-dependency and other dependencies with latest versions - remove dslplatform dependency
  RED-5694: Imported new version of platform-dependency and fixed a couple of issues.

redaction-service-v1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>platform-dependency</artifactId>
         <groupId>com.iqser.red</groupId>
-        <version>1.17.0</version>
+        <version>2.2.0</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -23,7 +23,6 @@
 
     <properties>
         <pdfbox.version>2.0.24</pdfbox.version>
-        <dsljson.version>1.9.9</dsljson.version>
     </properties>
 
 
@@ -32,7 +31,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.22.0</version>
+                <version>2.1.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

redaction-service-v1/redaction-service-api-v1/pom.xml

@@ -17,13 +17,6 @@
 
     <dependencies>
 
-        <!-- https://mvnrepository.com/artifact/com.dslplatform/dsl-json-java8 -->
-        <dependency>
-            <groupId>com.dslplatform</groupId>
-            <artifactId>dsl-json-java8</artifactId>
-            <version>${dsljson.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
@@ -55,10 +48,13 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <annotationProcessors>
+                    <annotationProcessorPaths>
-                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
+                        <path>
-                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
+                            <groupId>org.projectlombok</groupId>
-                    </annotationProcessors>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
         </plugins>

redaction-service-v1/redaction-service-server-v1/pom.xml

@@ -14,10 +14,10 @@
     <properties>
         <drools.version>7.73.0.Final</drools.version>
         <kie.version>7.73.0.Final</kie.version>
-        <locationtech.version>1.18.2</locationtech.version>
+        <locationtech.version>1.19.0</locationtech.version>
-        <javaassist.version>3.28.0-GA</javaassist.version>
+        <javaassist.version>3.29.2-GA</javaassist.version>
         <ahocorasick.version>0.6.3</ahocorasick.version>
-        <jackson.version>2.13.2</jackson.version>
+        <jackson.version>2.14.2</jackson.version>
     </properties>
 
     <dependencies>
@@ -30,6 +30,7 @@
         <dependency>
             <groupId>com.iqser.red.commons</groupId>
             <artifactId>storage-commons</artifactId>
+            <version>2.1.0</version>
         </dependency>
 
         <dependency>
@@ -93,7 +94,6 @@
         <dependency>
             <groupId>com.iqser.red.commons</groupId>
             <artifactId>metric-commons</artifactId>
-            <version>1.7.0</version>
         </dependency>
         <!-- other external -->
         <dependency>
@@ -135,10 +135,13 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <annotationProcessors>
+                    <annotationProcessorPaths>
-                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
+                        <path>
-                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
+                            <groupId>org.projectlombok</groupId>
-                    </annotationProcessors>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
 

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();

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();

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 java.util.ArrayList;
-import com.dslplatform.json.JsonAttribute;
+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();

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 {

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 {

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 {

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();

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();

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 {

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 {

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

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;
 
 

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) {
 

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() {
 

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 {

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;

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<TextPositionSequence> sequences = new ArrayList<>();

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<String, Float> probabilities = new HashMap<>();

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;

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;

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;

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;

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;

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<ImageMetadata> data = new ArrayList<>();
 
     private List<ImageMetadata> dataCV = new ArrayList<>();
@@ -27,7 +23,6 @@ public class ImageServiceResponse {
 
     @JsonProperty(value = "imageMetadata")
     @JsonAlias("data")
-    @JsonAttribute(alternativeNames = {"imageMetadata"})
     public void setData(List<ImageMetadata> data) {this.data = data;}
 
 }

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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

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

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})
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
-    static class RedactionIntegrationTestConfiguration {
+    @ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=StorageAutoConfiguration.class)})
+    public static class RedactionIntegrationTestConfiguration {
 
         @Bean
         public KieContainer kieContainer() {

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

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

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();

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<Type> 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

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