RED-5694 - Upgrade spring-boot to 3.0

- remove comment code
This commit is contained in:
devplant 2023-04-05 13:48:28 +03:00
parent e22e16aef1
commit d366d9207a
5 changed files with 0 additions and 28 deletions

View File

@ -1,6 +1,5 @@
package com.iqser.red.service.redaction.v1.server.classification.model; package com.iqser.red.service.redaction.v1.server.classification.model;
//import com.dslplatform.json.JsonAttribute;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText; import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
@ -17,7 +16,6 @@ public class Header {
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public SearchableText getSearchableText() { public SearchableText getSearchableText() {
SearchableText searchableText = new SearchableText(); SearchableText searchableText = new SearchableText();

View File

@ -3,8 +3,6 @@ package com.iqser.red.service.redaction.v1.server.classification.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
//import com.dslplatform.json.CompiledJson;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -12,7 +10,6 @@ import lombok.NoArgsConstructor;
@Data @Data
@Builder @Builder
//@CompiledJson
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class SimplifiedText { public class SimplifiedText {

View File

@ -8,8 +8,6 @@ import java.util.stream.Collectors;
import org.apache.pdfbox.text.TextPosition; 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.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
@ -25,7 +23,6 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j @Slf4j
@Data @Data
@Builder @Builder
//@CompiledJson
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@JsonIgnoreProperties({"empty"}) @JsonIgnoreProperties({"empty"})
@ -144,7 +141,6 @@ public class TextPositionSequence implements CharSequence {
* @return the text direction adjusted minX value * @return the text direction adjusted minX value
*/ */
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public float getMinXDirAdj() { public float getMinXDirAdj() {
return textPositions.get(0).getXDirAdj(); return textPositions.get(0).getXDirAdj();
@ -159,7 +155,6 @@ public class TextPositionSequence implements CharSequence {
* @return the text direction adjusted maxX value * @return the text direction adjusted maxX value
*/ */
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public float getMaxXDirAdj() { public float getMaxXDirAdj() {
return textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + HEIGHT_PADDING; 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. * @return the text direction adjusted minY value. The upper border of the bounding box of the word.
*/ */
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public float getMinYDirAdj() { public float getMinYDirAdj() {
return textPositions.get(0).getYDirAdj() - getTextHeight(); 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. * @return the text direction adjusted maxY value. The lower border of the bounding box of the word.
*/ */
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public float getMaxYDirAdj() { public float getMaxYDirAdj() {
return textPositions.get(0).getYDirAdj(); return textPositions.get(0).getYDirAdj();
@ -198,7 +191,6 @@ public class TextPositionSequence implements CharSequence {
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public float getTextHeight() { public float getTextHeight() {
return textPositions.get(0).getHeightDir() + HEIGHT_PADDING; return textPositions.get(0).getHeightDir() + HEIGHT_PADDING;
@ -206,7 +198,6 @@ public class TextPositionSequence implements CharSequence {
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public float getHeight() { public float getHeight() {
return getMaxYDirAdj() - getMinYDirAdj(); return getMaxYDirAdj() - getMinYDirAdj();
@ -214,7 +205,6 @@ public class TextPositionSequence implements CharSequence {
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public float getWidth() { public float getWidth() {
return getMaxXDirAdj() - getMinXDirAdj(); return getMaxXDirAdj() - getMinXDirAdj();
@ -222,7 +212,6 @@ public class TextPositionSequence implements CharSequence {
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public String getFont() { public String getFont() {
return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", ""); return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", "");
@ -230,7 +219,6 @@ public class TextPositionSequence implements CharSequence {
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public String getFontStyle() { public String getFontStyle() {
String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase(); String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase();
@ -249,7 +237,6 @@ public class TextPositionSequence implements CharSequence {
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public float getFontSize() { public float getFontSize() {
return textPositions.get(0).getFontSizeInPt(); return textPositions.get(0).getFontSizeInPt();
@ -257,7 +244,6 @@ public class TextPositionSequence implements CharSequence {
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
public float getSpaceWidth() { public float getSpaceWidth() {
return textPositions.get(0).getWidthOfSpace(); return textPositions.get(0).getWidthOfSpace();
@ -274,7 +260,6 @@ public class TextPositionSequence implements CharSequence {
* @return bounding box of the word in Pdf Coordinate System * @return bounding box of the word in Pdf Coordinate System
*/ */
@JsonIgnore @JsonIgnore
// @JsonAttribute(ignore = true)
@SneakyThrows @SneakyThrows
public Rectangle getRectangle() { public Rectangle getRectangle() {

View File

@ -1,7 +1,5 @@
package com.iqser.red.service.redaction.v1.server.redaction.model.image; 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.JsonAlias;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@ -11,7 +9,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
@Data @Data
//@CompiledJson
public class ImageServiceResponse { public class ImageServiceResponse {
private String dossierId; private String dossierId;
@ -19,7 +16,6 @@ public class ImageServiceResponse {
@JsonProperty(value = "imageMetadata") @JsonProperty(value = "imageMetadata")
@JsonAlias("data") @JsonAlias("data")
// @JsonAttribute(alternativeNames = {"imageMetadata"})
private List<ImageMetadata> data = new ArrayList<>(); private List<ImageMetadata> data = new ArrayList<>();
private List<ImageMetadata> dataCV = new ArrayList<>(); private List<ImageMetadata> dataCV = new ArrayList<>();
@ -27,7 +23,6 @@ public class ImageServiceResponse {
@JsonProperty(value = "imageMetadata") @JsonProperty(value = "imageMetadata")
@JsonAlias("data") @JsonAlias("data")
// @JsonAttribute(alternativeNames = {"imageMetadata"})
public void setData(List<ImageMetadata> data) {this.data = data;} public void setData(List<ImageMetadata> data) {this.data = data;}
} }

View File

@ -1,11 +1,8 @@
package com.iqser.red.service.redaction.v1.server.redaction.model.image; package com.iqser.red.service.redaction.v1.server.redaction.model.image;
//import com.dslplatform.json.CompiledJson;
import lombok.Data; import lombok.Data;
@Data @Data
//@CompiledJson
public class ImageSize { public class ImageSize {
private float quotient; private float quotient;