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 bb49a6fb..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/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 d3f4d47b..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/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 735b9e22..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/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 cc02d673..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 66b09905..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;