Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@
package com.regula.documentreader.webclient.model;

import com.google.gson.annotations.SerializedName;
import java.util.Arrays;
import java.util.Objects;

/** DocumentImage */
public class DocumentImage {
public static final String SERIALIZED_NAME_IMAGE = "image";

@SerializedName(SERIALIZED_NAME_IMAGE)
private byte[] image;
private String image;

public DocumentImage withImage(byte[] image) {
public DocumentImage withImage(String image) {
this.image = image;
return this;
}
Expand All @@ -33,11 +32,11 @@ public DocumentImage withImage(byte[] image) {
*
* @return image
*/
public byte[] getImage() {
public String getImage() {
return image;
}

public void setImage(byte[] image) {
public void setImage(String image) {
this.image = image;
}

Expand All @@ -50,12 +49,12 @@ public boolean equals(java.lang.Object o) {
return false;
}
DocumentImage documentImage = (DocumentImage) o;
return Arrays.equals(this.image, documentImage.image);
return Objects.equals(this.image, documentImage.image);
}

@Override
public int hashCode() {
return Objects.hash(Arrays.hashCode(image));
return Objects.hash(image);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@
package com.regula.documentreader.webclient.model;

import com.google.gson.annotations.SerializedName;
import java.util.Arrays;
import java.util.Objects;

/** ImageData */
public class ImageData {
public static final String SERIALIZED_NAME_IMAGE = "image";

@SerializedName(SERIALIZED_NAME_IMAGE)
private byte[] image;
private String image;

public ImageData withImage(byte[] image) {
public ImageData withImage(String image) {
this.image = image;
return this;
}
Expand All @@ -33,11 +32,11 @@ public ImageData withImage(byte[] image) {
*
* @return image
*/
public byte[] getImage() {
public String getImage() {
return image;
}

public void setImage(byte[] image) {
public void setImage(String image) {
this.image = image;
}

Expand All @@ -50,12 +49,12 @@ public boolean equals(java.lang.Object o) {
return false;
}
ImageData imageData = (ImageData) o;
return Arrays.equals(this.image, imageData.image);
return Objects.equals(this.image, imageData.image);
}

@Override
public int hashCode() {
return Objects.hash(Arrays.hashCode(image));
return Objects.hash(image);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
package com.regula.documentreader.webclient.model;

import com.google.gson.annotations.SerializedName;
import java.util.Arrays;
import java.util.Objects;

/** ImagesFieldValue */
Expand All @@ -26,12 +25,12 @@ public class ImagesFieldValue {
public static final String SERIALIZED_NAME_VALUE = "value";

@SerializedName(SERIALIZED_NAME_VALUE)
private byte[] value;
private String value;

public static final String SERIALIZED_NAME_ORIGINAL_VALUE = "originalValue";

@SerializedName(SERIALIZED_NAME_ORIGINAL_VALUE)
private byte[] originalValue;
private String originalValue;

public static final String SERIALIZED_NAME_ORIGINAL_PAGE_INDEX = "originalPageIndex";

Expand Down Expand Up @@ -81,7 +80,7 @@ public void setSource(String source) {
this.source = source;
}

public ImagesFieldValue withValue(byte[] value) {
public ImagesFieldValue withValue(String value) {
this.value = value;
return this;
}
Expand All @@ -91,15 +90,15 @@ public ImagesFieldValue withValue(byte[] value) {
*
* @return value
*/
public byte[] getValue() {
public String getValue() {
return value;
}

public void setValue(byte[] value) {
public void setValue(String value) {
this.value = value;
}

public ImagesFieldValue withOriginalValue(byte[] originalValue) {
public ImagesFieldValue withOriginalValue(String originalValue) {
this.originalValue = originalValue;
return this;
}
Expand All @@ -110,11 +109,11 @@ public ImagesFieldValue withOriginalValue(byte[] originalValue) {
* @return originalValue
*/
@javax.annotation.Nullable
public byte[] getOriginalValue() {
public String getOriginalValue() {
return originalValue;
}

public void setOriginalValue(byte[] originalValue) {
public void setOriginalValue(String originalValue) {
this.originalValue = originalValue;
}

Expand Down Expand Up @@ -239,8 +238,8 @@ public boolean equals(java.lang.Object o) {
}
ImagesFieldValue imagesFieldValue = (ImagesFieldValue) o;
return Objects.equals(this.source, imagesFieldValue.source)
&& Arrays.equals(this.value, imagesFieldValue.value)
&& Arrays.equals(this.originalValue, imagesFieldValue.originalValue)
&& Objects.equals(this.value, imagesFieldValue.value)
&& Objects.equals(this.originalValue, imagesFieldValue.originalValue)
&& Objects.equals(this.originalPageIndex, imagesFieldValue.originalPageIndex)
&& Objects.equals(this.pageIndex, imagesFieldValue.pageIndex)
&& Objects.equals(this.lightIndex, imagesFieldValue.lightIndex)
Expand All @@ -253,8 +252,8 @@ public boolean equals(java.lang.Object o) {
public int hashCode() {
return Objects.hash(
source,
Arrays.hashCode(value),
Arrays.hashCode(originalValue),
value,
originalValue,
originalPageIndex,
pageIndex,
lightIndex,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public class Scenario {

public static final String MRZ_AND_LOCATE = "MrzAndLocate";

public static final String BARCODE_AND_LOCATE = "BarcodeAndLocate";

public static final String MRZ_OR_OCR = "MrzOrOcr";

public static final String MRZ_OR_BARCODE_OR_OCR = "MrzOrBarcodeOrOcr";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,25 @@

import com.regula.documentreader.webclient.model.ImagesFieldValue;
import com.regula.documentreader.webclient.model.Source;
import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
import java.util.List;
import javax.annotation.Nullable;

public class ImagesField extends com.regula.documentreader.webclient.model.ImagesField {

@Nullable
public byte[] getValue(String source, boolean original) {
String result;
for (ImagesFieldValue value : getValueList()) {
if (value.getSource().equals(source)) {
if (original) {
return value.getOriginalValue();
} else {
return value.getValue();
result = value.getOriginalValue();
}
else {
result = value.getValue();
}
return Base64.decode(result);

}
}
return null;
Expand All @@ -41,6 +46,6 @@ public byte[] getValue() {
if (bestValue.getSource() == Source.VISUAL && value.getSource() == Source.RFID)
bestValue = value;
}
return bestValue.getValue();
return Base64.decode(bestValue.getValue());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import com.regula.documentreader.webclient.ApiException;
import com.regula.documentreader.webclient.model.ImageData;

import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;

public class ProcessRequestImage
extends com.regula.documentreader.webclient.model.ProcessRequestImage {

Expand All @@ -12,7 +14,9 @@ public ProcessRequestImage(byte[] image) {
if (image == null) {
throw new ApiException("No image provided");
}
this.setImageData(new ImageData().withImage(image));

String base64Image = Base64.encode(image);
this.setImageData(new ImageData().withImage(base64Image));
}

public ProcessRequestImage(byte[] image, Integer light) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.regula.documentreader.webclient.model.ext;

import com.google.gson.Gson;
import com.regula.documentreader.webclient.model.ContainerList;
import com.regula.documentreader.webclient.model.ProcessParams;
import com.regula.documentreader.webclient.model.ProcessRequest;
Expand Down Expand Up @@ -34,4 +35,9 @@ public RecognitionRequest(ProcessParams params, ContainerList containerList) {
withContainerList(containerList);
withSystemInfo(new ProcessSystemInfo());
}

public String json() {
Gson gson = new Gson();
return gson.toJson(this);
}
}
Original file line number Diff line number Diff line change
@@ -1,22 +1,32 @@
package com.regula.documentreader.webclient.model.ext;

import com.google.gson.Gson;
import com.regula.documentreader.webclient.model.*;
import com.regula.documentreader.webclient.model.ext.authenticity.Authenticity;

import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;

public class RecognitionResponse {
private final ProcessResponse originalResponse;
private final Gson gson;

public RecognitionResponse(ProcessResponse originalResponse) {
this.gson = new Gson();
this.originalResponse = originalResponse;
}

public ProcessResponse getOriginalResponse() {
return originalResponse;
}

public String json() {
return this.gson.toJson(this.originalResponse);
}

@Nullable
public Status status() {
StatusResult result = resultByType(Result.STATUS);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
public class Main {
public static final String API_BASE_PATH = "API_BASE_PATH";
public static final String TEST_LICENSE = "TEST_LICENSE";


public static void main(String[] args) throws IOException, ApiException {

var apiBaseUrl = System.getenv(API_BASE_PATH);
Expand Down Expand Up @@ -65,6 +63,7 @@ public static void main(String[] args) throws IOException, ApiException {
);

var api = new DocumentReaderApi(apiBaseUrl);

if (licenseFromEnv != null) api.setLicense(licenseFromEnv);
if (licenseFromFile != null) api.setLicense(licenseFromFile);

Expand All @@ -73,6 +72,10 @@ public static void main(String[] args) throws IOException, ApiException {
System.out.format("Web API version %s%n", info.getVersion());

RecognitionResponse response = api.process(request);

var requestJson = request.json();
var responseJson = response.json();

// to send raw request(ex encrypted one) with overriding processing params here use next api
// RecognitionResponse response = api.process(request, requestParams);

Expand Down