Permalink
Browse files

Merge branch 'master' of https://github.com/oehf/ipf

  • Loading branch information...
ohr committed Oct 11, 2017
2 parents 44f119b + 047bb74 commit b9199b1f109b8867ed62947cefd17e44d33f6d9c
@@ -17,7 +17,7 @@
import lombok.Getter;
import org.apache.commons.lang3.Validate;
import org.openehealth.ipf.commons.ihe.hpd.stub.ErrorType;
import org.openehealth.ipf.commons.ihe.hpd.stub.dsmlv2.ErrorResponse.ErrorType;
/**
* @author Dmytro Rud
@@ -16,12 +16,12 @@
package org.openehealth.ipf.commons.ihe.hpd;
import org.openehealth.ipf.commons.core.modules.api.ValidationException;
import org.openehealth.ipf.commons.ihe.hpd.stub.ErrorType;
import org.openehealth.ipf.commons.ihe.hpd.stub.chpidd.DownloadRequest;
import org.openehealth.ipf.commons.ihe.hpd.stub.chpidd.DownloadResponse;
import org.openehealth.ipf.commons.ihe.hpd.stub.dsmlv2.BatchRequest;
import org.openehealth.ipf.commons.ihe.hpd.stub.dsmlv2.BatchResponse;
import org.openehealth.ipf.commons.ihe.hpd.stub.dsmlv2.DsmlMessage;
import org.openehealth.ipf.commons.ihe.hpd.stub.dsmlv2.ErrorResponse.ErrorType;
import org.openehealth.ipf.commons.ihe.hpd.stub.dsmlv2.SearchRequest;
import org.openehealth.ipf.commons.xml.XsdValidator;

This file was deleted.

Oops, something went wrong.
@@ -74,11 +74,11 @@
@XmlAttribute(name = "requestID")
protected String requestID;
@XmlAttribute(name = "processing")
protected String processing;
protected BatchRequest.RequestProcessingType processing;
@XmlAttribute(name = "responseOrder")
protected String responseOrder;
protected BatchRequest.RequestResponseOrder responseOrder;
@XmlAttribute(name = "onError")
protected String onError;
protected BatchRequest.RequestErrorHandlingType onError;
/**
* Gets the value of the authRequest property.
@@ -169,12 +169,12 @@ public void setRequestID(String value) {
*
* @return
* possible object is
* {@link String }
* {@link BatchRequest.RequestProcessingType }
*
*/
public String getProcessing() {
public BatchRequest.RequestProcessingType getProcessing() {
if (processing == null) {
return "sequential";
return BatchRequest.RequestProcessingType.SEQUENTIAL;
} else {
return processing;
}
@@ -185,10 +185,10 @@ public String getProcessing() {
*
* @param value
* allowed object is
* {@link String }
* {@link BatchRequest.RequestProcessingType }
*
*/
public void setProcessing(String value) {
public void setProcessing(BatchRequest.RequestProcessingType value) {
this.processing = value;
}
@@ -197,12 +197,12 @@ public void setProcessing(String value) {
*
* @return
* possible object is
* {@link String }
* {@link BatchRequest.RequestResponseOrder }
*
*/
public String getResponseOrder() {
public BatchRequest.RequestResponseOrder getResponseOrder() {
if (responseOrder == null) {
return "sequential";
return BatchRequest.RequestResponseOrder.SEQUENTIAL;
} else {
return responseOrder;
}
@@ -213,10 +213,10 @@ public String getResponseOrder() {
*
* @param value
* allowed object is
* {@link String }
* {@link BatchRequest.RequestResponseOrder }
*
*/
public void setResponseOrder(String value) {
public void setResponseOrder(BatchRequest.RequestResponseOrder value) {
this.responseOrder = value;
}
@@ -225,12 +225,12 @@ public void setResponseOrder(String value) {
*
* @return
* possible object is
* {@link String }
* {@link BatchRequest.RequestErrorHandlingType }
*
*/
public String getOnError() {
public BatchRequest.RequestErrorHandlingType getOnError() {
if (onError == null) {
return "exit";
return BatchRequest.RequestErrorHandlingType.EXIT;
} else {
return onError;
}
@@ -241,11 +241,146 @@ public String getOnError() {
*
* @param value
* allowed object is
* {@link String }
* {@link BatchRequest.RequestErrorHandlingType }
*
*/
public void setOnError(String value) {
public void setOnError(BatchRequest.RequestErrorHandlingType value) {
this.onError = value;
}
/**
* <p>Java class for null.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* <pre>
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="resume"/>
* &lt;enumeration value="exit"/>
* &lt;/restriction>
* &lt;/simpleType>
* </pre>
*
*/
@XmlType(name = "")
@XmlEnum
public enum RequestErrorHandlingType {
@XmlEnumValue("resume")
RESUME("resume"),
@XmlEnumValue("exit")
EXIT("exit");
private final String value;
RequestErrorHandlingType(String v) {
value = v;
}
public String value() {
return value;
}
public static BatchRequest.RequestErrorHandlingType fromValue(String v) {
for (BatchRequest.RequestErrorHandlingType c: BatchRequest.RequestErrorHandlingType.values()) {
if (c.value.equals(v)) {
return c;
}
}
throw new IllegalArgumentException(v);
}
}
/**
* <p>Java class for null.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* <pre>
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="sequential"/>
* &lt;enumeration value="parallel"/>
* &lt;/restriction>
* &lt;/simpleType>
* </pre>
*
*/
@XmlType(name = "")
@XmlEnum
public enum RequestProcessingType {
@XmlEnumValue("sequential")
SEQUENTIAL("sequential"),
@XmlEnumValue("parallel")
PARALLEL("parallel");
private final String value;
RequestProcessingType(String v) {
value = v;
}
public String value() {
return value;
}
public static BatchRequest.RequestProcessingType fromValue(String v) {
for (BatchRequest.RequestProcessingType c: BatchRequest.RequestProcessingType.values()) {
if (c.value.equals(v)) {
return c;
}
}
throw new IllegalArgumentException(v);
}
}
/**
* <p>Java class for null.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* <pre>
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="sequential"/>
* &lt;enumeration value="unordered"/>
* &lt;/restriction>
* &lt;/simpleType>
* </pre>
*
*/
@XmlType(name = "")
@XmlEnum
public enum RequestResponseOrder {
@XmlEnumValue("sequential")
SEQUENTIAL("sequential"),
@XmlEnumValue("unordered")
UNORDERED("unordered");
private final String value;
RequestResponseOrder(String v) {
value = v;
}
public String value() {
return value;
}
public static BatchRequest.RequestResponseOrder fromValue(String v) {
for (BatchRequest.RequestResponseOrder c: BatchRequest.RequestResponseOrder.values()) {
if (c.value.equals(v)) {
return c;
}
}
throw new IllegalArgumentException(v);
}
}
}
@@ -1,13 +1,9 @@
package org.openehealth.ipf.commons.ihe.hpd.stub.dsmlv2;
import javax.xml.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
/**
@@ -50,7 +46,7 @@
@XmlAttribute(name = "name", required = true)
protected String name;
@XmlAttribute(name = "operation", required = true)
protected String operation;
protected DsmlModification.ModificationOperationType operation;
/**
* Gets the value of the value property.
@@ -110,10 +106,10 @@ public void setName(String value) {
*
* @return
* possible object is
* {@link String }
* {@link DsmlModification.ModificationOperationType }
*
*/
public String getOperation() {
public DsmlModification.ModificationOperationType getOperation() {
return operation;
}
@@ -122,11 +118,59 @@ public String getOperation() {
*
* @param value
* allowed object is
* {@link String }
* {@link DsmlModification.ModificationOperationType }
*
*/
public void setOperation(String value) {
public void setOperation(DsmlModification.ModificationOperationType value) {
this.operation = value;
}
/**
* <p>Java class for null.
*
* <p>The following schema fragment specifies the expected content contained within this class.
* <p>
* <pre>
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="add"/>
* &lt;enumeration value="delete"/>
* &lt;enumeration value="replace"/>
* &lt;/restriction>
* &lt;/simpleType>
* </pre>
*
*/
@XmlType(name = "")
@XmlEnum
public enum ModificationOperationType {
@XmlEnumValue("add")
ADD("add"),
@XmlEnumValue("delete")
DELETE("delete"),
@XmlEnumValue("replace")
REPLACE("replace");
private final String value;
ModificationOperationType(String v) {
value = v;
}
public String value() {
return value;
}
public static DsmlModification.ModificationOperationType fromValue(String v) {
for (DsmlModification.ModificationOperationType c: DsmlModification.ModificationOperationType.values()) {
if (c.value.equals(v)) {
return c;
}
}
throw new IllegalArgumentException(v);
}
}
}
Oops, something went wrong.

0 comments on commit b9199b1

Please sign in to comment.