You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2021/05/05 10:17:26 UTC
[camel] branch main updated: CAMEL-16580: Remove deprecated code
from MLLP component
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 2c90d2d CAMEL-16580: Remove deprecated code from MLLP component
2c90d2d is described below
commit 2c90d2d13e92c7dfddba4e67561d2022ccca449a
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed May 5 10:28:38 2021 +0100
CAMEL-16580: Remove deprecated code from MLLP component
---
.../apache/camel/catalog/docs/mllp-component.adoc | 4 +-
.../component/mllp/MllpEndpointUriFactory.java | 4 +-
.../org/apache/camel/component/mllp/mllp.json | 2 -
.../camel-mllp/src/main/docs/mllp-component.adoc | 4 +-
.../camel/component/mllp/MllpConfiguration.java | 69 ----------
.../apache/camel/component/mllp/MllpEndpoint.java | 27 ----
.../endpoint/dsl/MllpEndpointBuilderFactory.java | 140 ---------------------
.../modules/ROOT/pages/mllp-component.adoc | 4 +-
8 files changed, 4 insertions(+), 250 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mllp-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mllp-component.adoc
index 8e15096..c65e696 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mllp-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/mllp-component.adoc
@@ -93,14 +93,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (27 parameters):
+=== Query Parameters (25 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *autoAck* (common) | Enable/Disable the automatic generation of a MLLP Acknowledgement MLLP Consumers only | true | boolean
-| *bufferWrites* (common) | *Deprecated* Enable/Disable the buffering of HL7 payloads before writing to the socket. | false | boolean
| *hl7Headers* (common) | Enable/Disable the automatic generation of message headers from the HL7 Message MLLP Consumers only | true | boolean
| *requireEndOfData* (common) | Enable/Disable strict compliance to the MLLP standard. The MLLP standard specifies START_OF_BLOCKhl7 payloadEND_OF_BLOCKEND_OF_DATA, however, some systems do not send the final END_OF_DATA byte. This setting controls whether or not the final END_OF_DATA byte is required or optional. | true | boolean
| *stringPayload* (common) | Enable/Disable converting the payload to a String. If enabled, HL7 Payloads received from external systems will be validated converted to a String. If the charsetName property is set, that character set will be used for the conversion. If the charsetName property is not set, the value of MSH-18 will be used to determine th appropriate character set. If MSH-18 is not set, then the default ISO-8859-1 character set will be use. | true | boolean
@@ -123,7 +122,6 @@ with the following path and query parameters:
| *bindTimeout* (timeout) | TCP Server Only - The number of milliseconds to retry binding to a server port | 30000 | int
| *connectTimeout* (timeout) | Timeout (in milliseconds) for establishing for a TCP connection TCP Client only | 30000 | int
| *idleTimeout* (timeout) | The approximate idle time allowed before the Client TCP Connection will be reset. A null value or a value less than or equal to zero will disable the idle timeout. | | Integer
-| *maxReceiveTimeouts* (timeout) | *Deprecated* The maximum number of timeouts (specified by receiveTimeout) allowed before the TCP Connection will be reset. | | Integer
| *readTimeout* (timeout) | The SO_TIMEOUT value (in milliseconds) used after the start of an MLLP frame has been received | 5000 | int
| *receiveTimeout* (timeout) | The SO_TIMEOUT value (in milliseconds) used when waiting for the start of an MLLP frame | 15000 | int
|===
diff --git a/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriFactory.java b/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriFactory.java
index 489ee47..1b0f3f3 100644
--- a/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriFactory.java
+++ b/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriFactory.java
@@ -20,11 +20,9 @@ public class MllpEndpointUriFactory extends org.apache.camel.support.component.E
private static final Set<String> PROPERTY_NAMES;
private static final Set<String> SECRET_PROPERTY_NAMES;
static {
- Set<String> props = new HashSet<>(29);
+ Set<String> props = new HashSet<>(27);
props.add("bindRetryInterval");
- props.add("bufferWrites");
props.add("lenientBind");
- props.add("maxReceiveTimeouts");
props.add("hostname");
props.add("bridgeErrorHandler");
props.add("bindTimeout");
diff --git a/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json b/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json
index 2f28d4f..a70511b 100644
--- a/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json
+++ b/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json
@@ -33,7 +33,6 @@
"hostname": { "kind": "path", "displayName": "Hostname", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Hostname or IP for connection for the TCP connection. The default value is null, which means any local IP address" },
"port": { "kind": "path", "displayName": "Port", "group": "common", "label": "", "required": true, "type": "integer", "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Port number for the TCP connection" },
"autoAck": { "kind": "parameter", "displayName": "Auto Ack", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Enable\/Disable the automatic generation of a MLLP Acknowledgement MLLP Consumers only" },
- "bufferWrites": { "kind": "parameter", "displayName": "Buffer Writes", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": true, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Enable\/Disable the buffering of HL7 payloads before writing to the socket." },
"hl7Headers": { "kind": "parameter", "displayName": "Hl7 Headers", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Enable\/Disable the automatic generation of message headers from the HL7 Message MLLP Consumers only" },
"requireEndOfData": { "kind": "parameter", "displayName": "Require End Of Data", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Enable\/Disable strict compliance to the MLLP standard. The MLLP standard specifies START_OF_BLOCKhl7 pa [...]
"stringPayload": { "kind": "parameter", "displayName": "String Payload", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Enable\/Disable converting the payload to a String. If enabled, HL7 Payloads received from external systems will [...]
@@ -56,7 +55,6 @@
"bindTimeout": { "kind": "parameter", "displayName": "Bind Timeout", "group": "timeout", "label": "advanced,consumer,tcp,timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "TCP Server Only - The number of milliseconds to retry binding to a server port" },
"connectTimeout": { "kind": "parameter", "displayName": "Connect Timeout", "group": "timeout", "label": "advanced,producer,tcp,timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Timeout (in milliseconds) for establishing for a TCP connection TCP Client only" },
"idleTimeout": { "kind": "parameter", "displayName": "Idle Timeout", "group": "timeout", "label": "advanced,tcp,timeout", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The approximate idle time allowed before the Client TCP Connection will be reset. A null value or a value l [...]
- "maxReceiveTimeouts": { "kind": "parameter", "displayName": "Max Receive Timeouts", "group": "timeout", "label": "advanced,consumer,tcp,timeout", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The maximum number of timeouts (specified by receiveTimeout) allowed before the TCP [...]
"readTimeout": { "kind": "parameter", "displayName": "Read Timeout", "group": "timeout", "label": "advanced,tcp,timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 5000, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The SO_TIMEOUT value (in milliseconds) used after the start of an MLLP frame has been received" },
"receiveTimeout": { "kind": "parameter", "displayName": "Receive Timeout", "group": "timeout", "label": "advanced,tcp,timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 15000, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The SO_TIMEOUT value (in milliseconds) used when waiting for the start of an MLLP frame" }
}
diff --git a/components/camel-mllp/src/main/docs/mllp-component.adoc b/components/camel-mllp/src/main/docs/mllp-component.adoc
index 8e15096..c65e696 100644
--- a/components/camel-mllp/src/main/docs/mllp-component.adoc
+++ b/components/camel-mllp/src/main/docs/mllp-component.adoc
@@ -93,14 +93,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (27 parameters):
+=== Query Parameters (25 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *autoAck* (common) | Enable/Disable the automatic generation of a MLLP Acknowledgement MLLP Consumers only | true | boolean
-| *bufferWrites* (common) | *Deprecated* Enable/Disable the buffering of HL7 payloads before writing to the socket. | false | boolean
| *hl7Headers* (common) | Enable/Disable the automatic generation of message headers from the HL7 Message MLLP Consumers only | true | boolean
| *requireEndOfData* (common) | Enable/Disable strict compliance to the MLLP standard. The MLLP standard specifies START_OF_BLOCKhl7 payloadEND_OF_BLOCKEND_OF_DATA, however, some systems do not send the final END_OF_DATA byte. This setting controls whether or not the final END_OF_DATA byte is required or optional. | true | boolean
| *stringPayload* (common) | Enable/Disable converting the payload to a String. If enabled, HL7 Payloads received from external systems will be validated converted to a String. If the charsetName property is set, that character set will be used for the conversion. If the charsetName property is not set, the value of MSH-18 will be used to determine th appropriate character set. If MSH-18 is not set, then the default ISO-8859-1 character set will be use. | true | boolean
@@ -123,7 +122,6 @@ with the following path and query parameters:
| *bindTimeout* (timeout) | TCP Server Only - The number of milliseconds to retry binding to a server port | 30000 | int
| *connectTimeout* (timeout) | Timeout (in milliseconds) for establishing for a TCP connection TCP Client only | 30000 | int
| *idleTimeout* (timeout) | The approximate idle time allowed before the Client TCP Connection will be reset. A null value or a value less than or equal to zero will disable the idle timeout. | | Integer
-| *maxReceiveTimeouts* (timeout) | *Deprecated* The maximum number of timeouts (specified by receiveTimeout) allowed before the TCP Connection will be reset. | | Integer
| *readTimeout* (timeout) | The SO_TIMEOUT value (in milliseconds) used after the start of an MLLP frame has been received | 5000 | int
| *receiveTimeout* (timeout) | The SO_TIMEOUT value (in milliseconds) used when waiting for the start of an MLLP frame | 15000 | int
|===
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConfiguration.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConfiguration.java
index 9ffdf10..7a3b044 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConfiguration.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConfiguration.java
@@ -67,10 +67,6 @@ public class MllpConfiguration implements Cloneable {
@UriParam(label = "advanced,consumer,tcp", defaultValue = "5")
int maxConcurrentConsumers = 5;
- @Deprecated // use idleTimeout
- @UriParam(label = "advanced,consumer,tcp,timeout", defaultValue = "null")
- Integer maxReceiveTimeouts;
-
@UriParam(label = "advanced,tcp,timeout", defaultValue = "null")
Integer idleTimeout;
@@ -98,10 +94,6 @@ public class MllpConfiguration implements Cloneable {
@UriParam(defaultValue = "true")
boolean hl7Headers = true;
- @UriParam(defaultValue = "false")
- @Deprecated
- boolean bufferWrites;
-
@UriParam(defaultValue = "true")
boolean requireEndOfData = true;
@@ -147,7 +139,6 @@ public class MllpConfiguration implements Cloneable {
target.sendBufferSize = source.sendBufferSize;
target.autoAck = source.autoAck;
target.hl7Headers = source.hl7Headers;
- target.bufferWrites = source.bufferWrites;
target.requireEndOfData = source.requireEndOfData;
target.stringPayload = source.stringPayload;
target.validatePayload = source.validatePayload;
@@ -433,44 +424,6 @@ public class MllpConfiguration implements Cloneable {
this.maxConcurrentConsumers = maxConcurrentConsumers;
}
- /**
- * Determine if the maxReceiveTimeouts URI parameter has been set
- *
- * @return true if the parameter has been set; false otherwise
- *
- * @deprecated Use the idleTimeout URI parameter
- */
- @Deprecated
- public boolean hasMaxReceiveTimeouts() {
- return maxReceiveTimeouts != null;
- }
-
- /**
- * Retrieve the value of the maxReceiveTimeouts URI parameter.
- *
- * @return the maximum number of receive timeouts before the TCP Socket is reset
- *
- * @deprecated Use the idleTimeout URI parameter
- */
- @Deprecated
- public Integer getMaxReceiveTimeouts() {
- return maxReceiveTimeouts;
- }
-
- /**
- * The maximum number of timeouts (specified by receiveTimeout) allowed before the TCP Connection will be reset.
- *
- * @param maxReceiveTimeouts maximum number of receiveTimeouts
- *
- * @deprecated Use the idleTimeout URI parameter. For backward compibility, setting this
- * parameter will result in an idle timeout of maxReceiveTimeouts * receiveTimeout.
- * If idleTimeout is also specified, this parameter will be ignored.
- */
- @Deprecated
- public void setMaxReceiveTimeouts(Integer maxReceiveTimeouts) {
- this.maxReceiveTimeouts = maxReceiveTimeouts;
- }
-
public boolean hasIdleTimeout() {
return idleTimeout != null && idleTimeout > 0;
}
@@ -675,22 +628,6 @@ public class MllpConfiguration implements Cloneable {
this.validatePayload = validatePayload;
}
- public boolean isBufferWrites() {
- return bufferWrites;
- }
-
- /**
- * Enable/Disable the buffering of HL7 payloads before writing to the socket.
- *
- * @deprecated the parameter will be ignored
- *
- * @param bufferWrites enabled if true, otherwise disabled
- */
- @Deprecated
- public void setBufferWrites(boolean bufferWrites) {
- this.bufferWrites = bufferWrites;
- }
-
@Override
public int hashCode() {
return Objects.hash(bridgeErrorHandler,
@@ -702,7 +639,6 @@ public class MllpConfiguration implements Cloneable {
connectTimeout,
receiveTimeout,
maxConcurrentConsumers,
- maxReceiveTimeouts,
idleTimeout,
readTimeout,
keepAlive,
@@ -712,7 +648,6 @@ public class MllpConfiguration implements Cloneable {
sendBufferSize,
autoAck,
hl7Headers,
- bufferWrites,
requireEndOfData,
stringPayload,
validatePayload,
@@ -741,13 +676,11 @@ public class MllpConfiguration implements Cloneable {
&& readTimeout == rhs.readTimeout
&& autoAck == rhs.autoAck
&& hl7Headers == rhs.hl7Headers
- && bufferWrites == rhs.bufferWrites
&& requireEndOfData == rhs.requireEndOfData
&& stringPayload == rhs.stringPayload
&& validatePayload == rhs.validatePayload
&& Objects.equals(backlog, rhs.backlog)
&& Objects.equals(maxConcurrentConsumers, rhs.maxConcurrentConsumers)
- && Objects.equals(maxReceiveTimeouts, rhs.maxReceiveTimeouts)
&& Objects.equals(idleTimeout, rhs.idleTimeout)
&& Objects.equals(keepAlive, rhs.keepAlive)
&& Objects.equals(tcpNoDelay, rhs.tcpNoDelay)
@@ -769,7 +702,6 @@ public class MllpConfiguration implements Cloneable {
+ ", connectTimeout=" + connectTimeout
+ ", receiveTimeout=" + receiveTimeout
+ ", maxConcurrentConsumers=" + maxConcurrentConsumers
- + ", maxReceiveTimeouts=" + maxReceiveTimeouts
+ ", idleTimeout=" + idleTimeout
+ ", readTimeout=" + readTimeout
+ ", keepAlive=" + keepAlive
@@ -779,7 +711,6 @@ public class MllpConfiguration implements Cloneable {
+ ", sendBufferSize=" + sendBufferSize
+ ", autoAck=" + autoAck
+ ", hl7Headers=" + hl7Headers
- + ", bufferWrites=" + bufferWrites
+ ", requireEndOfData=" + requireEndOfData
+ ", stringPayload=" + stringPayload
+ ", validatePayload=" + validatePayload
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
index ed6477b..215ede4 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.mllp;
import java.io.IOException;
import java.net.Socket;
import java.net.SocketAddress;
-import java.nio.charset.Charset;
import java.util.Date;
import org.apache.camel.Category;
@@ -51,22 +50,6 @@ import org.slf4j.Logger;
@UriEndpoint(scheme = "mllp", firstVersion = "2.17.0", title = "MLLP", syntax = "mllp:hostname:port",
category = { Category.NETWORKING, Category.RPC, Category.MLLP }, generateConfigurer = false)
public class MllpEndpoint extends DefaultEndpoint {
- // Use constants from MllpProtocolConstants
- @Deprecated()
- public static final char START_OF_BLOCK = MllpProtocolConstants.START_OF_BLOCK;
- @Deprecated()
- public static final char END_OF_BLOCK = MllpProtocolConstants.END_OF_BLOCK;
- @Deprecated()
- public static final char END_OF_DATA = MllpProtocolConstants.END_OF_DATA;
- @Deprecated()
- public static final int END_OF_STREAM = MllpProtocolConstants.END_OF_STREAM;
- @Deprecated()
- public static final char SEGMENT_DELIMITER = MllpProtocolConstants.SEGMENT_DELIMITER;
- @Deprecated()
- public static final char MESSAGE_TERMINATOR = MllpProtocolConstants.MESSAGE_TERMINATOR;
-
- @Deprecated // Use MllpComponent.getDefaultCharset()
- public static final Charset DEFAULT_CHARSET = MllpComponent.getDefaultCharset();
@UriPath
@Metadata(required = true)
@@ -284,16 +267,6 @@ public class MllpEndpoint extends DefaultEndpoint {
configuration.setHl7Headers(hl7Headers);
}
- /**
- * @deprecated this parameter will be ignored.
- *
- * @param bufferWrites
- */
- @Deprecated
- public void setBufferWrites(Boolean bufferWrites) {
- configuration.setBufferWrites(bufferWrites);
- }
-
public void setRequireEndOfData(Boolean requireEndOfData) {
configuration.setRequireEndOfData(requireEndOfData);
}
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
index 95523f0..565ba35 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
@@ -75,41 +75,6 @@ public interface MllpEndpointBuilderFactory {
return this;
}
/**
- * Enable/Disable the buffering of HL7 payloads before writing to the
- * socket.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: common
- *
- * @param bufferWrites the value to set
- * @return the dsl builder
- */
- @Deprecated
- default MllpEndpointConsumerBuilder bufferWrites(boolean bufferWrites) {
- doSetProperty("bufferWrites", bufferWrites);
- return this;
- }
- /**
- * Enable/Disable the buffering of HL7 payloads before writing to the
- * socket.
- *
- * The option will be converted to a <code>boolean</code>
- * type.
- *
- * Default: false
- * Group: common
- *
- * @param bufferWrites the value to set
- * @return the dsl builder
- */
- @Deprecated
- default MllpEndpointConsumerBuilder bufferWrites(String bufferWrites) {
- doSetProperty("bufferWrites", bufferWrites);
- return this;
- }
- /**
* Enable/Disable the automatic generation of message headers from the
* HL7 Message MLLP Consumers only.
*
@@ -755,41 +720,6 @@ public interface MllpEndpointBuilderFactory {
return this;
}
/**
- * The maximum number of timeouts (specified by receiveTimeout) allowed
- * before the TCP Connection will be reset.
- *
- * The option is a: <code>java.lang.Integer</code> type.
- *
- * Group: timeout
- *
- * @param maxReceiveTimeouts the value to set
- * @return the dsl builder
- */
- @Deprecated
- default AdvancedMllpEndpointConsumerBuilder maxReceiveTimeouts(
- Integer maxReceiveTimeouts) {
- doSetProperty("maxReceiveTimeouts", maxReceiveTimeouts);
- return this;
- }
- /**
- * The maximum number of timeouts (specified by receiveTimeout) allowed
- * before the TCP Connection will be reset.
- *
- * The option will be converted to a
- * <code>java.lang.Integer</code> type.
- *
- * Group: timeout
- *
- * @param maxReceiveTimeouts the value to set
- * @return the dsl builder
- */
- @Deprecated
- default AdvancedMllpEndpointConsumerBuilder maxReceiveTimeouts(
- String maxReceiveTimeouts) {
- doSetProperty("maxReceiveTimeouts", maxReceiveTimeouts);
- return this;
- }
- /**
* The SO_TIMEOUT value (in milliseconds) used after the start of an
* MLLP frame has been received.
*
@@ -901,41 +831,6 @@ public interface MllpEndpointBuilderFactory {
return this;
}
/**
- * Enable/Disable the buffering of HL7 payloads before writing to the
- * socket.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: common
- *
- * @param bufferWrites the value to set
- * @return the dsl builder
- */
- @Deprecated
- default MllpEndpointProducerBuilder bufferWrites(boolean bufferWrites) {
- doSetProperty("bufferWrites", bufferWrites);
- return this;
- }
- /**
- * Enable/Disable the buffering of HL7 payloads before writing to the
- * socket.
- *
- * The option will be converted to a <code>boolean</code>
- * type.
- *
- * Default: false
- * Group: common
- *
- * @param bufferWrites the value to set
- * @return the dsl builder
- */
- @Deprecated
- default MllpEndpointProducerBuilder bufferWrites(String bufferWrites) {
- doSetProperty("bufferWrites", bufferWrites);
- return this;
- }
- /**
* Enable/Disable the automatic generation of message headers from the
* HL7 Message MLLP Consumers only.
*
@@ -1480,41 +1375,6 @@ public interface MllpEndpointBuilderFactory {
return this;
}
/**
- * Enable/Disable the buffering of HL7 payloads before writing to the
- * socket.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: common
- *
- * @param bufferWrites the value to set
- * @return the dsl builder
- */
- @Deprecated
- default MllpEndpointBuilder bufferWrites(boolean bufferWrites) {
- doSetProperty("bufferWrites", bufferWrites);
- return this;
- }
- /**
- * Enable/Disable the buffering of HL7 payloads before writing to the
- * socket.
- *
- * The option will be converted to a <code>boolean</code>
- * type.
- *
- * Default: false
- * Group: common
- *
- * @param bufferWrites the value to set
- * @return the dsl builder
- */
- @Deprecated
- default MllpEndpointBuilder bufferWrites(String bufferWrites) {
- doSetProperty("bufferWrites", bufferWrites);
- return this;
- }
- /**
* Enable/Disable the automatic generation of message headers from the
* HL7 Message MLLP Consumers only.
*
diff --git a/docs/components/modules/ROOT/pages/mllp-component.adoc b/docs/components/modules/ROOT/pages/mllp-component.adoc
index 1190907..0bd31e0 100644
--- a/docs/components/modules/ROOT/pages/mllp-component.adoc
+++ b/docs/components/modules/ROOT/pages/mllp-component.adoc
@@ -95,14 +95,13 @@ with the following path and query parameters:
|===
-=== Query Parameters (27 parameters):
+=== Query Parameters (25 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *autoAck* (common) | Enable/Disable the automatic generation of a MLLP Acknowledgement MLLP Consumers only | true | boolean
-| *bufferWrites* (common) | *Deprecated* Enable/Disable the buffering of HL7 payloads before writing to the socket. | false | boolean
| *hl7Headers* (common) | Enable/Disable the automatic generation of message headers from the HL7 Message MLLP Consumers only | true | boolean
| *requireEndOfData* (common) | Enable/Disable strict compliance to the MLLP standard. The MLLP standard specifies START_OF_BLOCKhl7 payloadEND_OF_BLOCKEND_OF_DATA, however, some systems do not send the final END_OF_DATA byte. This setting controls whether or not the final END_OF_DATA byte is required or optional. | true | boolean
| *stringPayload* (common) | Enable/Disable converting the payload to a String. If enabled, HL7 Payloads received from external systems will be validated converted to a String. If the charsetName property is set, that character set will be used for the conversion. If the charsetName property is not set, the value of MSH-18 will be used to determine th appropriate character set. If MSH-18 is not set, then the default ISO-8859-1 character set will be use. | true | boolean
@@ -125,7 +124,6 @@ with the following path and query parameters:
| *bindTimeout* (timeout) | TCP Server Only - The number of milliseconds to retry binding to a server port | 30000 | int
| *connectTimeout* (timeout) | Timeout (in milliseconds) for establishing for a TCP connection TCP Client only | 30000 | int
| *idleTimeout* (timeout) | The approximate idle time allowed before the Client TCP Connection will be reset. A null value or a value less than or equal to zero will disable the idle timeout. | | Integer
-| *maxReceiveTimeouts* (timeout) | *Deprecated* The maximum number of timeouts (specified by receiveTimeout) allowed before the TCP Connection will be reset. | | Integer
| *readTimeout* (timeout) | The SO_TIMEOUT value (in milliseconds) used after the start of an MLLP frame has been received | 5000 | int
| *receiveTimeout* (timeout) | The SO_TIMEOUT value (in milliseconds) used when waiting for the start of an MLLP frame | 15000 | int
|===