Pull request #424: RED-4648: Fixed wrong field names for DSLJson

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

* commit '708b7f992cadba8779ac6d2f7a9e9e4a837eaf1b':
  RED-4648: Fixed wrong field names for DSLJson
This commit is contained in:
Dominique Eiflaender 2022-07-21 12:33:42 +02:00
commit d3a5265b7f
2 changed files with 22 additions and 0 deletions

View File

@ -5,6 +5,7 @@ import org.springframework.beans.BeanUtils;
import com.dslplatform.json.CompiledJson; import com.dslplatform.json.CompiledJson;
import com.dslplatform.json.JsonAttribute; import com.dslplatform.json.JsonAttribute;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -26,7 +27,13 @@ public class RedTextPosition {
private float pageHeight; private float pageHeight;
private float pageWidth; private float pageWidth;
private String unicode; private String unicode;
@JsonAlias("xdirAdj")
@JsonAttribute(alternativeNames = {"xdirAdj"})
private float XDirAdj; private float XDirAdj;
@JsonAlias("ydirAdj")
@JsonAttribute(alternativeNames = {"ydirAdj"})
private float YDirAdj; private float YDirAdj;
private float width; private float width;
private float heightDir; private float heightDir;
@ -63,4 +70,14 @@ public class RedTextPosition {
} }
@JsonAlias("xdirAdj")
@JsonAttribute(alternativeNames = {"xdirAdj"})
public void setXDirAdj(float XDirAdj) {this.XDirAdj = XDirAdj;}
@JsonAlias("ydirAdj")
@JsonAttribute(alternativeNames = {"ydirAdj"})
public void setYDirAdj(float YDirAdj) {this.YDirAdj = YDirAdj;}
} }

View File

@ -21,4 +21,9 @@ public class ImageServiceResponse {
@JsonAttribute(alternativeNames = {"imageMetadata"}) @JsonAttribute(alternativeNames = {"imageMetadata"})
private List<ImageMetadata> data = new ArrayList<>(); private List<ImageMetadata> data = new ArrayList<>();
@JsonProperty(value = "imageMetadata")
@JsonAlias("data")
@JsonAttribute(alternativeNames = {"imageMetadata"})
public void setData(List<ImageMetadata> data) {this.data = data;}
} }