diff --git a/api-generator/generator-java/src/main/java/esa/mo/tools/stubgen/java/JavaServiceInfo.java b/api-generator/generator-java/src/main/java/esa/mo/tools/stubgen/java/JavaServiceInfo.java index d80538bcc..f60f70663 100644 --- a/api-generator/generator-java/src/main/java/esa/mo/tools/stubgen/java/JavaServiceInfo.java +++ b/api-generator/generator-java/src/main/java/esa/mo/tools/stubgen/java/JavaServiceInfo.java @@ -266,7 +266,7 @@ private List generateOperationArgs(LanguageWriter file, OperationSummary List opArgs = new LinkedList<>(); opArgs.add(op.getName().toUpperCase() + "_OP_NUMBER"); opArgs.add(initNewLine + "new " + generator.createElementType(file, StdStrings.MAL, null, StdStrings.IDENTIFIER) + "(\"" + op.getName() + "\")"); - opArgs.add(initNewLine + "" + op.getReplay()); + // opArgs.add(initNewLine + "" + op.getReplay()); opArgs.add(initNewLine + "new " + generator.createElementType(file, StdStrings.MAL, null, StdStrings.USHORT) + "(" + op.getSet() + ")"); switch (op.getPattern()) { diff --git a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALInvokeOperation.java b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALInvokeOperation.java index 95e8ac2fc..808e8e19c 100644 --- a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALInvokeOperation.java +++ b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALInvokeOperation.java @@ -63,8 +63,6 @@ public class MALInvokeOperation extends MALOperation { * * @param number Number of the operation. * @param name Name of the operation. - * @param replayable Boolean that indicates whether the operation is - * replayable or not * @param capabilitySet Capability set of the operation. * @param invokeStage The stage information for the INVOKE stage. * @param invokeAckStage The stage information for the INVOKE_ACK stage. @@ -75,13 +73,12 @@ public class MALInvokeOperation extends MALOperation { */ public MALInvokeOperation(final UShort number, final Identifier name, - final Boolean replayable, final UShort capabilitySet, final OperationField[] invokeStage, final OperationField[] invokeAckStage, final OperationField[] invokeResponseStage) throws java.lang.IllegalArgumentException { - super(number, name, replayable, InteractionType.INVOKE, capabilitySet); + super(number, name, InteractionType.INVOKE, capabilitySet); this.invokeStage = invokeStage; this.invokeAckStage = invokeAckStage; diff --git a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALOperation.java b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALOperation.java index da69064dd..5798b2817 100644 --- a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALOperation.java +++ b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALOperation.java @@ -33,7 +33,6 @@ public abstract class MALOperation { private final Identifier name; private final UShort number; - private final Boolean replayable; private final InteractionType interactionType; private final UShort capabilitySet; private MALService service; @@ -43,28 +42,23 @@ public abstract class MALOperation { * * @param number Number of the operation. * @param name Name of the operation. - * @param replayable Boolean that indicates whether the operation is - * replayable or not * @param interactionType Interaction type of the operation * @param capabilitySet Capability set of the operation. * @throws java.lang.IllegalArgumentException If any argument is null. */ public MALOperation(final UShort number, final Identifier name, - final Boolean replayable, final InteractionType interactionType, final UShort capabilitySet) throws java.lang.IllegalArgumentException { if ((number == null) || (name == null) - || (replayable == null) || (interactionType == null) || (capabilitySet == null)) { throw new IllegalArgumentException("Supplied arguments must not be NULL"); } this.name = name; this.number = number; - this.replayable = replayable; this.interactionType = interactionType; this.capabilitySet = capabilitySet; } @@ -106,15 +100,6 @@ public boolean isPubSub() { return interactionType == InteractionType.PUBSUB; } - /** - * Returns whether the operation is replayable. - * - * @return Whether the operation is replayable. - */ - public Boolean isReplayable() { - return replayable; - } - /** * Returns the operation service. * diff --git a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALProgressOperation.java b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALProgressOperation.java index 3919032c7..d663ea6a4 100644 --- a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALProgressOperation.java +++ b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALProgressOperation.java @@ -73,8 +73,6 @@ public class MALProgressOperation extends MALOperation { * * @param number Number of the operation. * @param name Name of the operation. - * @param replayable Boolean that indicates whether the operation is - * replayable or not * @param capabilitySet Capability set of the operation. * @param progressStage The stage information for the PROGRESS stage. * @param progressAckStage The stage information for the PROGRESS_ACK stage. @@ -87,13 +85,12 @@ public class MALProgressOperation extends MALOperation { */ public MALProgressOperation(final UShort number, final Identifier name, - final Boolean replayable, final UShort capabilitySet, final OperationField[] progressStage, final OperationField[] progressAckStage, final OperationField[] progressUpdateStage, final OperationField[] progressResponseStage) throws java.lang.IllegalArgumentException { - super(number, name, replayable, InteractionType.PROGRESS, capabilitySet); + super(number, name, InteractionType.PROGRESS, capabilitySet); this.progressStage = progressStage; this.progressAckStage = progressAckStage; diff --git a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALPubSubOperation.java b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALPubSubOperation.java index 42be49173..72ea5605b 100644 --- a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALPubSubOperation.java +++ b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALPubSubOperation.java @@ -149,8 +149,6 @@ public class MALPubSubOperation extends MALOperation { * * @param number Number of the operation. * @param name Name of the operation. - * @param replayable Boolean that indicates whether the operation is - * replayable or not * @param capabilitySet Capability set of the operation. * @param fields PUB-SUB fields. transmitted by the PUBLISH/NOTIFY message * of a PUBLISH-SUBSCRIBE operation. @@ -159,11 +157,10 @@ public class MALPubSubOperation extends MALOperation { */ public MALPubSubOperation(final UShort number, final Identifier name, - final Boolean replayable, final UShort capabilitySet, final OperationField[] fields) throws java.lang.IllegalArgumentException { - super(number, name, replayable, InteractionType.PUBSUB, capabilitySet); + super(number, name, InteractionType.PUBSUB, capabilitySet); OperationField[] publishFields = new OperationField[fields.length + 1]; OperationField[] notifyFields = new OperationField[fields.length + 2]; diff --git a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALRequestOperation.java b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALRequestOperation.java index ef74002c8..0e4b8733d 100644 --- a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALRequestOperation.java +++ b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALRequestOperation.java @@ -55,8 +55,6 @@ public class MALRequestOperation extends MALOperation { * * @param number Number of the operation. * @param name Name of the operation. - * @param replayable Boolean that indicates whether the operation is - * replayable or not * @param capabilitySet Capability set of the operation. * @param requestStage The stage information for the REQUEST stage. * @param responseStage The stage information for the REQUEST_RESPONSE @@ -66,12 +64,11 @@ public class MALRequestOperation extends MALOperation { */ public MALRequestOperation(final UShort number, final Identifier name, - final Boolean replayable, final UShort capabilitySet, final OperationField[] requestStage, final OperationField[] responseStage) throws java.lang.IllegalArgumentException { - super(number, name, replayable, InteractionType.REQUEST, capabilitySet); + super(number, name, InteractionType.REQUEST, capabilitySet); this.requestStage = requestStage; this.responseStage = responseStage; diff --git a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALSendOperation.java b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALSendOperation.java index 1744ddd19..286bc67b2 100644 --- a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALSendOperation.java +++ b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALSendOperation.java @@ -46,8 +46,6 @@ public class MALSendOperation extends MALOperation { * * @param number Number of the operation. * @param name Name of the operation. - * @param replayable Boolean that indicates whether the operation is - * replayable or not * @param capabilitySet Capability set of the operation. * @param sendStage The stage information for the SEND stage. * @throws java.lang.IllegalArgumentException If any argument is null, @@ -55,11 +53,10 @@ public class MALSendOperation extends MALOperation { */ public MALSendOperation(final UShort number, final Identifier name, - final Boolean replayable, final UShort capabilitySet, final OperationField[] sendStage) throws java.lang.IllegalArgumentException { - super(number, name, replayable, InteractionType.SEND, capabilitySet); + super(number, name, InteractionType.SEND, capabilitySet); this.sendStage = sendStage; } diff --git a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALSubmitOperation.java b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALSubmitOperation.java index 119d74e7d..e9c5b458e 100644 --- a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALSubmitOperation.java +++ b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/MALSubmitOperation.java @@ -56,8 +56,6 @@ public class MALSubmitOperation extends MALOperation { * * @param number Number of the operation. * @param name Name of the operation. - * @param replayable Boolean that indicates whether the operation is - * replayable or not * @param capabilitySet Capability set of the operation. * @param submitStage The stage information for the SUBMIT stage. * @throws java.lang.IllegalArgumentException If any argument is null, @@ -65,11 +63,10 @@ public class MALSubmitOperation extends MALOperation { */ public MALSubmitOperation(final UShort number, final Identifier name, - final Boolean replayable, final UShort capabilitySet, final OperationField[] submitStage) throws java.lang.IllegalArgumentException { - super(number, name, replayable, InteractionType.SUBMIT, capabilitySet); + super(number, name, InteractionType.SUBMIT, capabilitySet); this.submitStage = submitStage; }