From de3f9a8d9ea901c41e94bd4f86db203615445633 Mon Sep 17 00:00:00 2001 From: Austin Henriksen Date: Tue, 14 May 2024 09:40:48 -0400 Subject: [PATCH] Remove Remnants of the `java:optional` Metadata (#2164) --- cpp/src/slice2java/JavaUtil.cpp | 17 - cpp/src/slice2java/JavaUtil.h | 5 - cpp/test/Ice/optional/Test.ice | 2 - cpp/test/Ice/optional/TestAMD.ice | 2 - cpp/test/Ice/optional/TestAMDI.cpp | 6 - cpp/test/Ice/optional/TestAMDI.h | 5 - cpp/test/Ice/optional/TestI.cpp | 6 - cpp/test/Ice/optional/TestI.h | 2 - csharp/test/Ice/optional/Test.ice | 2 - csharp/test/Ice/optional/TestAMD.ice | 2 - csharp/test/Ice/optional/TestAMDI.cs | 6 - csharp/test/Ice/optional/TestI.cs | 5 - .../java/test/Ice/optional/AMDInitialI.java | 183 --- .../main/java/test/Ice/optional/AllTests.java | 1441 +++++++---------- .../main/java/test/Ice/optional/InitialI.java | 186 +-- .../src/main/java/test/Ice/optional/Test.ice | 105 +- .../main/java/test/Ice/optional/TestAMD.ice | 123 +- js/test/Ice/optional/AMDInitialI.js | 5 - js/test/Ice/optional/InitialI.js | 5 - js/test/Ice/optional/Test.ice | 2 - .../typescript/Ice/optional/AMDInitialI.ts | 5 - js/test/typescript/Ice/optional/InitialI.ts | 5 - js/test/typescript/Ice/optional/Test.ice | 2 - matlab/test/Ice/optional/Test.ice | 2 - php/test/Ice/optional/Test.ice | 2 - python/test/Ice/optional/Server.py | 3 - python/test/Ice/optional/ServerAMD.py | 3 - python/test/Ice/optional/Test.ice | 2 - ruby/test/Ice/optional/Test.ice | 2 - swift/test/Ice/optional/Test.ice | 2 - swift/test/Ice/optional/TestAMD.ice | 2 - swift/test/Ice/optional/TestAMDI.swift | 4 - swift/test/Ice/optional/TestI.swift | 4 - 33 files changed, 666 insertions(+), 1482 deletions(-) diff --git a/cpp/src/slice2java/JavaUtil.cpp b/cpp/src/slice2java/JavaUtil.cpp index 22671a1e48e..dc08c235b44 100644 --- a/cpp/src/slice2java/JavaUtil.cpp +++ b/cpp/src/slice2java/JavaUtil.cpp @@ -1010,23 +1010,6 @@ Slice::JavaGenerator::getStaticId(const TypePtr& type, const string& package) co } } -bool -Slice::JavaGenerator::useOptionalMapping(const OperationPtr& p) -{ - // - // The "java:optional" metadata can be applied to an operation or its - // interface to force the mapping to use the Optional types. - // - // Without the tag, parameters use the normal (non-optional) mapping. - // - static const string tag = "java:optional"; - - ClassDefPtr cl = dynamic_pointer_cast(p->container()); - assert(cl); - - return p->hasMetaData(tag) || cl->hasMetaData(tag); -} - string Slice::JavaGenerator::getOptionalFormat(const TypePtr& type) { diff --git a/cpp/src/slice2java/JavaUtil.h b/cpp/src/slice2java/JavaUtil.h index 72f65b07ecd..bc260b790ed 100644 --- a/cpp/src/slice2java/JavaUtil.h +++ b/cpp/src/slice2java/JavaUtil.h @@ -129,11 +129,6 @@ namespace Slice // std::string getStaticId(const TypePtr&, const std::string&) const; - // - // Determines whether an operation should use the optional mapping. - // - bool useOptionalMapping(const OperationPtr&); - // // Returns the optional type corresponding to the given Slice type. // diff --git a/cpp/test/Ice/optional/Test.ice b/cpp/test/Ice/optional/Test.ice index 1640552ff7e..4619285ac0c 100644 --- a/cpp/test/Ice/optional/Test.ice +++ b/cpp/test/Ice/optional/Test.ice @@ -291,8 +291,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); bool supportsCsharpSerializable(); diff --git a/cpp/test/Ice/optional/TestAMD.ice b/cpp/test/Ice/optional/TestAMD.ice index 335ba47ec49..5c289022cac 100644 --- a/cpp/test/Ice/optional/TestAMD.ice +++ b/cpp/test/Ice/optional/TestAMD.ice @@ -291,8 +291,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); bool supportsCsharpSerializable(); diff --git a/cpp/test/Ice/optional/TestAMDI.cpp b/cpp/test/Ice/optional/TestAMDI.cpp index a2fd80ad239..8d9e4426f4a 100644 --- a/cpp/test/Ice/optional/TestAMDI.cpp +++ b/cpp/test/Ice/optional/TestAMDI.cpp @@ -472,12 +472,6 @@ InitialI::opMDict2Async( response(OpMDict2MarshaledResult(p1, p1, current)); } -void -InitialI::supportsRequiredParamsAsync(function response, function, const Ice::Current&) -{ - response(false); -} - void InitialI::supportsJavaSerializableAsync( function response, diff --git a/cpp/test/Ice/optional/TestAMDI.h b/cpp/test/Ice/optional/TestAMDI.h index 83651f38fa8..4bf7e3d7dc3 100644 --- a/cpp/test/Ice/optional/TestAMDI.h +++ b/cpp/test/Ice/optional/TestAMDI.h @@ -297,11 +297,6 @@ class InitialI final : public Test::Initial std::function, const Ice::Current&) final; - void supportsRequiredParamsAsync( - std::function, - std::function, - const Ice::Current&) final; - void supportsJavaSerializableAsync( std::function, std::function, diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp index 6b3c495f618..0ddf89adaef 100644 --- a/cpp/test/Ice/optional/TestI.cpp +++ b/cpp/test/Ice/optional/TestI.cpp @@ -378,12 +378,6 @@ InitialI::opMDict2(optional p1, const Ice::Current& current return OpMDict2MarshaledResult(p1, p1, current); } -bool -InitialI::supportsRequiredParams(const Ice::Current&) -{ - return false; -} - bool InitialI::supportsJavaSerializable(const Ice::Current&) { diff --git a/cpp/test/Ice/optional/TestI.h b/cpp/test/Ice/optional/TestI.h index c1d38177542..3b695708e8b 100644 --- a/cpp/test/Ice/optional/TestI.h +++ b/cpp/test/Ice/optional/TestI.h @@ -150,8 +150,6 @@ class InitialI : public Test::Initial virtual OpMDict2MarshaledResult opMDict2(std::optional, const Ice::Current&); - virtual bool supportsRequiredParams(const Ice::Current&); - virtual bool supportsJavaSerializable(const Ice::Current&); virtual bool supportsCsharpSerializable(const Ice::Current&); diff --git a/csharp/test/Ice/optional/Test.ice b/csharp/test/Ice/optional/Test.ice index 33cbd240177..4c91bd21802 100644 --- a/csharp/test/Ice/optional/Test.ice +++ b/csharp/test/Ice/optional/Test.ice @@ -266,8 +266,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); } diff --git a/csharp/test/Ice/optional/TestAMD.ice b/csharp/test/Ice/optional/TestAMD.ice index 2beb3f1466f..6f71f6d75dc 100644 --- a/csharp/test/Ice/optional/TestAMD.ice +++ b/csharp/test/Ice/optional/TestAMD.ice @@ -269,8 +269,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); } diff --git a/csharp/test/Ice/optional/TestAMDI.cs b/csharp/test/Ice/optional/TestAMDI.cs index d26fd8dc670..dbe8908efe8 100644 --- a/csharp/test/Ice/optional/TestAMDI.cs +++ b/csharp/test/Ice/optional/TestAMDI.cs @@ -285,12 +285,6 @@ public async override Task return new Test.Initial_OpMDict2MarshaledResult(p1, p1, current); } - public override Task - supportsRequiredParamsAsync(Ice.Current current) - { - return Task.FromResult(false); - } - public override Task supportsJavaSerializableAsync(Ice.Current current) { diff --git a/csharp/test/Ice/optional/TestI.cs b/csharp/test/Ice/optional/TestI.cs index 89db5330c19..9392ec3c026 100644 --- a/csharp/test/Ice/optional/TestI.cs +++ b/csharp/test/Ice/optional/TestI.cs @@ -333,11 +333,6 @@ public override Test.Initial_OpMDict2MarshaledResult return new Test.Initial_OpMDict2MarshaledResult(p1, p1, current); } - public override bool supportsRequiredParams(Ice.Current current) - { - return false; - } - public override bool supportsJavaSerializable(Ice.Current current) { return false; diff --git a/java/test/src/main/java/test/Ice/optional/AMDInitialI.java b/java/test/src/main/java/test/Ice/optional/AMDInitialI.java index 701420fb27b..e6a81d87e04 100644 --- a/java/test/src/main/java/test/Ice/optional/AMDInitialI.java +++ b/java/test/src/main/java/test/Ice/optional/AMDInitialI.java @@ -88,148 +88,72 @@ public CompletionStage opByteAsync(Optional p1, Curr return CompletableFuture.completedFuture(new Initial.OpByteResult(p1, p1)); } - @Override - public CompletionStage opByteReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpByteReqResult(p1, p1)); - } - @Override public CompletionStage opBoolAsync(Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpBoolResult(p1, p1)); } - @Override - public CompletionStage opBoolReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpBoolReqResult(p1, p1)); - } - @Override public CompletionStage opShortAsync(Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpShortResult(p1, p1)); } - @Override - public CompletionStage opShortReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpShortReqResult(p1, p1)); - } - @Override public CompletionStage opIntAsync(OptionalInt p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpIntResult(p1, p1)); } - @Override - public CompletionStage opIntReqAsync(OptionalInt p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpIntReqResult(p1, p1)); - } - @Override public CompletionStage opLongAsync(OptionalLong p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpLongResult(p1, p1)); } - @Override - public CompletionStage opLongReqAsync(OptionalLong p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpLongReqResult(p1, p1)); - } - @Override public CompletionStage opFloatAsync(Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpFloatResult(p1, p1)); } - @Override - public CompletionStage opFloatReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpFloatReqResult(p1, p1)); - } - @Override public CompletionStage opDoubleAsync(OptionalDouble p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpDoubleResult(p1, p1)); } - @Override - public CompletionStage opDoubleReqAsync( - OptionalDouble p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpDoubleReqResult(p1, p1)); - } - @Override public CompletionStage opStringAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpStringResult(p1, p1)); } - @Override - public CompletionStage opStringReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpStringReqResult(p1, p1)); - } - @Override public CompletionStage opMyEnumAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpMyEnumResult(p1, p1)); } - @Override - public CompletionStage opMyEnumReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpMyEnumReqResult(p1, p1)); - } - @Override public CompletionStage opSmallStructAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpSmallStructResult(p1, p1)); } - @Override - public CompletionStage opSmallStructReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpSmallStructReqResult(p1, p1)); - } - @Override public CompletionStage opFixedStructAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpFixedStructResult(p1, p1)); } - @Override - public CompletionStage opFixedStructReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpFixedStructReqResult(p1, p1)); - } - @Override public CompletionStage opVarStructAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpVarStructResult(p1, p1)); } - @Override - public CompletionStage opVarStructReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpVarStructReqResult(p1, p1)); - } - @Override public CompletionStage opMyInterfaceProxyAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpMyInterfaceProxyResult(p1, p1)); } - @Override - public CompletionStage opMyInterfaceProxyReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpMyInterfaceProxyReqResult(p1, p1)); - } - @Override public CompletionStage opOneOptionalAsync( OneOptional p1, Current current) { @@ -242,204 +166,102 @@ public CompletionStage opByteSeqAsync( return CompletableFuture.completedFuture(new Initial.OpByteSeqResult(p1, p1)); } - @Override - public CompletionStage opByteSeqReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpByteSeqReqResult(p1, p1)); - } - @Override public CompletionStage opBoolSeqAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpBoolSeqResult(p1, p1)); } - @Override - public CompletionStage opBoolSeqReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpBoolSeqReqResult(p1, p1)); - } - @Override public CompletionStage opShortSeqAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpShortSeqResult(p1, p1)); } - @Override - public CompletionStage opShortSeqReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpShortSeqReqResult(p1, p1)); - } - @Override public CompletionStage opIntSeqAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpIntSeqResult(p1, p1)); } - @Override - public CompletionStage opIntSeqReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpIntSeqReqResult(p1, p1)); - } - @Override public CompletionStage opLongSeqAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpLongSeqResult(p1, p1)); } - @Override - public CompletionStage opLongSeqReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpLongSeqReqResult(p1, p1)); - } - @Override public CompletionStage opFloatSeqAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpFloatSeqResult(p1, p1)); } - @Override - public CompletionStage opFloatSeqReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpFloatSeqReqResult(p1, p1)); - } - @Override public CompletionStage opDoubleSeqAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpDoubleSeqResult(p1, p1)); } - @Override - public CompletionStage opDoubleSeqReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpDoubleSeqReqResult(p1, p1)); - } - @Override public CompletionStage opStringSeqAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpStringSeqResult(p1, p1)); } - @Override - public CompletionStage opStringSeqReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpStringSeqReqResult(p1, p1)); - } - @Override public CompletionStage opSmallStructSeqAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpSmallStructSeqResult(p1, p1)); } - @Override - public CompletionStage opSmallStructSeqReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpSmallStructSeqReqResult(p1, p1)); - } - @Override public CompletionStage opSmallStructListAsync( Optional> p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpSmallStructListResult(p1, p1)); } - @Override - public CompletionStage opSmallStructListReqAsync( - Optional> p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpSmallStructListReqResult(p1, p1)); - } - @Override public CompletionStage opFixedStructSeqAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpFixedStructSeqResult(p1, p1)); } - @Override - public CompletionStage opFixedStructSeqReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpFixedStructSeqReqResult(p1, p1)); - } - @Override public CompletionStage opFixedStructListAsync( Optional> p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpFixedStructListResult(p1, p1)); } - @Override - public CompletionStage opFixedStructListReqAsync( - Optional> p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpFixedStructListReqResult(p1, p1)); - } - @Override public CompletionStage opVarStructSeqAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpVarStructSeqResult(p1, p1)); } - @Override - public CompletionStage opVarStructSeqReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpVarStructSeqReqResult(p1, p1)); - } - @Override public CompletionStage opSerializableAsync( Optional p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpSerializableResult(p1, p1)); } - @Override - public CompletionStage opSerializableReqAsync( - Optional p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpSerializableReqResult(p1, p1)); - } - @Override public CompletionStage opIntIntDictAsync( Optional> p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpIntIntDictResult(p1, p1)); } - @Override - public CompletionStage opIntIntDictReqAsync( - Optional> p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpIntIntDictReqResult(p1, p1)); - } - @Override public CompletionStage opStringIntDictAsync( Optional> p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpStringIntDictResult(p1, p1)); } - @Override - public CompletionStage opStringIntDictReqAsync( - Optional> p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpStringIntDictReqResult(p1, p1)); - } - @Override public CompletionStage opIntOneOptionalDictAsync( Optional> p1, Current current) { return CompletableFuture.completedFuture(new Initial.OpIntOneOptionalDictResult(p1, p1)); } - @Override - public CompletionStage opIntOneOptionalDictReqAsync( - Optional> p1, Current current) { - return CompletableFuture.completedFuture(new Initial.OpIntOneOptionalDictReqResult(p1, p1)); - } - @Override public CompletionStage opClassAndUnknownOptionalAsync(A p, Current current) { return CompletableFuture.completedFuture(null); @@ -491,11 +313,6 @@ public CompletionStage opMDict2Async( return CompletableFuture.completedFuture(new OpMDict2MarshaledResult(p1, p1, current)); } - @Override - public CompletionStage supportsRequiredParamsAsync(Current current) { - return CompletableFuture.completedFuture(true); - } - @Override public CompletionStage supportsJavaSerializableAsync(Current current) { return CompletableFuture.completedFuture(true); diff --git a/java/test/src/main/java/test/Ice/optional/AllTests.java b/java/test/src/main/java/test/Ice/optional/AllTests.java index cf66c413e56..9e894138a8c 100644 --- a/java/test/src/main/java/test/Ice/optional/AllTests.java +++ b/java/test/src/main/java/test/Ice/optional/AllTests.java @@ -342,7 +342,7 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { } // - // Send a request using blobjects. Upon receival, we don't read + // Send a request using blobjects. Upon receipt, we don't read // any of the optional members. This ensures the optional members // are skipped even if the receiver knows nothing about them. // @@ -588,7 +588,6 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { out.print("testing optional parameters... "); out.flush(); - final boolean reqParams = initial.supportsRequiredParams(); { Optional p1 = Optional.empty(); @@ -601,29 +600,22 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opByteAsync(p1).join(); test(r.returnValue.get() == (byte) 56 && r.p3.get() == (byte) 56); - if (reqParams) { - Initial.OpByteReqResult rr = initial.opByteReq(p1.get()); - test(rr.returnValue.get() == (byte) 56 && rr.p3.get() == (byte) 56); - rr = initial.opByteReqAsync(p1.get()).join(); - test(rr.returnValue.get() == (byte) 56 && rr.p3.get() == (byte) 56); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.F1); - os.writeByte(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opByteReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readByte(1).get() == (byte) 56); - test(in.readByte(3).get() == (byte) 56); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.F1); + os.writeByte(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opByte", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readByte(1).get() == (byte) 56); + test(in.readByte(3).get() == (byte) 56); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -637,29 +629,22 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opBoolAsync(p1).join(); test(r.returnValue.get() == true && r.p3.get() == true); - if (reqParams) { - Initial.OpBoolReqResult rr = initial.opBoolReq(true); - test(rr.returnValue.get() == true && rr.p3.get() == true); - rr = initial.opBoolReqAsync(true).join(); - test(rr.returnValue.get() == true && rr.p3.get() == true); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.F1); - os.writeBool(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opBoolReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readBool(1).get() == true); - test(in.readBool(3).get() == true); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.F1); + os.writeBool(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opBool", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readBool(1).get() == true); + test(in.readBool(3).get() == true); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -673,29 +658,22 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opShortAsync(p1).join(); test(r.returnValue.get() == 56 && r.p3.get() == 56); - if (reqParams) { - Initial.OpShortReqResult rr = initial.opShortReq(p1.get()); - test(rr.returnValue.get() == 56 && rr.p3.get() == 56); - rr = initial.opShortReqAsync(p1.get()).join(); - test(rr.returnValue.get() == 56 && rr.p3.get() == 56); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.F2); - os.writeShort(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opShortReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readShort(1).get() == 56); - test(in.readShort(3).get() == 56); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.F2); + os.writeShort(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opShort", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readShort(1).get() == 56); + test(in.readShort(3).get() == 56); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -709,29 +687,22 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opIntAsync(p1).join(); test(r.returnValue.getAsInt() == 56 && r.p3.getAsInt() == 56); - if (reqParams) { - Initial.OpIntReqResult rr = initial.opIntReq(p1.getAsInt()); - test(rr.returnValue.getAsInt() == 56 && rr.p3.getAsInt() == 56); - rr = initial.opIntReqAsync(p1.getAsInt()).join(); - test(rr.returnValue.getAsInt() == 56 && rr.p3.getAsInt() == 56); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.F4); - os.writeInt(p1.getAsInt()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opIntReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readInt(1).getAsInt() == 56); - test(in.readInt(3).getAsInt() == 56); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.F4); + os.writeInt(p1.getAsInt()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opInt", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readInt(1).getAsInt() == 56); + test(in.readInt(3).getAsInt() == 56); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -745,29 +716,22 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opLongAsync(p1).join(); test(r.returnValue.getAsLong() == 56 && r.p3.getAsLong() == 56); - if (reqParams) { - Initial.OpLongReqResult rr = initial.opLongReq(p1.getAsLong()); - test(rr.returnValue.getAsLong() == 56 && rr.p3.getAsLong() == 56); - rr = initial.opLongReqAsync(p1.getAsLong()).join(); - test(rr.returnValue.getAsLong() == 56 && rr.p3.getAsLong() == 56); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(1, OptionalFormat.F8); - os.writeLong(p1.getAsLong()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opLongReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readLong(2).getAsLong() == 56); - test(in.readLong(3).getAsLong() == 56); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(1, OptionalFormat.F8); + os.writeLong(p1.getAsLong()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opLong", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readLong(2).getAsLong() == 56); + test(in.readLong(3).getAsLong() == 56); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -781,29 +745,22 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opFloatAsync(p1).join(); test(r.returnValue.get() == 1.0 && r.p3.get() == 1.0); - if (reqParams) { - Initial.OpFloatReqResult rr = initial.opFloatReq(p1.get()); - test(rr.returnValue.get() == 1.0 && rr.p3.get() == 1.0); - rr = initial.opFloatReqAsync(p1.get()).join(); - test(rr.returnValue.get() == 1.0 && rr.p3.get() == 1.0); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.F4); - os.writeFloat(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opFloatReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readFloat(1).get() == 1.0); - test(in.readFloat(3).get() == 1.0); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.F4); + os.writeFloat(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opFloat", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readFloat(1).get() == 1.0); + test(in.readFloat(3).get() == 1.0); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -817,29 +774,22 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opDoubleAsync(p1).join(); test(r.returnValue.getAsDouble() == 1.0 && r.p3.getAsDouble() == 1.0); - if (reqParams) { - Initial.OpDoubleReqResult rr = initial.opDoubleReq(p1.getAsDouble()); - test(rr.returnValue.getAsDouble() == 1.0 && rr.p3.getAsDouble() == 1.0); - rr = initial.opDoubleReqAsync(p1.getAsDouble()).join(); - test(rr.returnValue.getAsDouble() == 1.0 && rr.p3.getAsDouble() == 1.0); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.F8); - os.writeDouble(p1.getAsDouble()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opDoubleReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readDouble(1).getAsDouble() == 1.0); - test(in.readDouble(3).getAsDouble() == 1.0); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.F8); + os.writeDouble(p1.getAsDouble()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opDouble", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readDouble(1).getAsDouble() == 1.0); + test(in.readDouble(3).getAsDouble() == 1.0); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -853,29 +803,22 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opStringAsync(p1).join(); test(r.returnValue.get().equals("test") && r.p3.get().equals("test")); - if (reqParams) { - Initial.OpStringReqResult rr = initial.opStringReq(p1.get()); - test(rr.returnValue.get().equals("test") && rr.p3.get().equals("test")); - rr = initial.opStringReqAsync(p1.get()).join(); - test(rr.returnValue.get().equals("test") && rr.p3.get().equals("test")); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeString(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opStringReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readString(1).get().equals("test")); - test(in.readString(3).get().equals("test")); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeString(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opString", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readString(1).get().equals("test")); + test(in.readString(3).get().equals("test")); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -889,31 +832,24 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opMyEnumAsync(p1).join(); test(r.returnValue.get() == MyEnum.MyEnumMember && r.p3.get() == MyEnum.MyEnumMember); - if (reqParams) { - Initial.OpMyEnumReqResult rr = initial.opMyEnumReq(p1.get()); - test(rr.returnValue.get() == MyEnum.MyEnumMember && rr.p3.get() == MyEnum.MyEnumMember); - rr = initial.opMyEnumReqAsync(p1.get()).join(); - test(rr.returnValue.get() == MyEnum.MyEnumMember && rr.p3.get() == MyEnum.MyEnumMember); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.Size); - MyEnum.ice_write(os, p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opMyEnumReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.Size)); - test(MyEnum.ice_read(in) == MyEnum.MyEnumMember); - test(in.readOptional(3, OptionalFormat.Size)); - test(MyEnum.ice_read(in) == MyEnum.MyEnumMember); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.Size); + MyEnum.ice_write(os, p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opMyEnum", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.Size)); + test(MyEnum.ice_read(in) == MyEnum.MyEnumMember); + test(in.readOptional(3, OptionalFormat.Size)); + test(MyEnum.ice_read(in) == MyEnum.MyEnumMember); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -929,36 +865,29 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opSmallStructAsync(p1).join(); test(r.returnValue.get().m == (byte) 56 && r.p3.get().m == (byte) 56); - if (reqParams) { - Initial.OpSmallStructReqResult rr = initial.opSmallStructReq(p1.get()); - test(rr.returnValue.get().m == (byte) 56 && rr.p3.get().m == (byte) 56); - rr = initial.opSmallStructReqAsync(p1.get()).join(); - test(rr.returnValue.get().m == (byte) 56 && rr.p3.get().m == (byte) 56); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSize(1); - SmallStruct.ice_write(os, p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opSmallStructReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.VSize)); - in.skipSize(); - SmallStruct f = SmallStruct.ice_read(in); - test(f.m == (byte) 56); - test(in.readOptional(3, OptionalFormat.VSize)); - in.skipSize(); - f = SmallStruct.ice_read(in); - test(f.m == (byte) 56); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSize(1); + SmallStruct.ice_write(os, p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opSmallStruct", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.VSize)); + in.skipSize(); + SmallStruct f = SmallStruct.ice_read(in); + test(f.m == (byte) 56); + test(in.readOptional(3, OptionalFormat.VSize)); + in.skipSize(); + f = SmallStruct.ice_read(in); + test(f.m == (byte) 56); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -972,36 +901,29 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opFixedStructAsync(p1).join(); test(r.returnValue.get().m == 56 && r.p3.get().m == 56); - if (reqParams) { - Initial.OpFixedStructReqResult rr = initial.opFixedStructReq(p1.get()); - test(rr.returnValue.get().m == 56 && rr.p3.get().m == 56); - rr = initial.opFixedStructReqAsync(p1.get()).join(); - test(rr.returnValue.get().m == 56 && rr.p3.get().m == 56); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSize(4); - FixedStruct.ice_write(os, p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opFixedStructReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.VSize)); - in.skipSize(); - FixedStruct f = FixedStruct.ice_read(in); - test(f.m == 56); - test(in.readOptional(3, OptionalFormat.VSize)); - in.skipSize(); - f = FixedStruct.ice_read(in); - test(f.m == 56); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSize(4); + FixedStruct.ice_write(os, p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opFixedStruct", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.VSize)); + in.skipSize(); + FixedStruct f = FixedStruct.ice_read(in); + test(f.m == 56); + test(in.readOptional(3, OptionalFormat.VSize)); + in.skipSize(); + f = FixedStruct.ice_read(in); + test(f.m == 56); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1015,68 +937,59 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opVarStructAsync(p1).join(); test(r.returnValue.get().m.equals("test") && r.p3.get().m.equals("test")); - if (reqParams) { - Initial.OpVarStructReqResult rr = initial.opVarStructReq(p1.get()); - test(rr.returnValue.get().m.equals("test") && rr.p3.get().m.equals("test")); - rr = initial.opVarStructReqAsync(p1.get()).join(); - test(rr.returnValue.get().m.equals("test") && rr.p3.get().m.equals("test")); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.FSize); - int pos = os.startSize(); - VarStruct.ice_write(os, p1.get()); - os.endSize(pos); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opVarStructReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.FSize)); - in.skip(4); - VarStruct v = VarStruct.ice_read(in); - test(v.m.equals("test")); - test(in.readOptional(3, OptionalFormat.FSize)); - in.skip(4); - v = VarStruct.ice_read(in); - test(v.m.equals("test")); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.FSize); + int pos = os.startSize(); + VarStruct.ice_write(os, p1.get()); + os.endSize(pos); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opVarStruct", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.FSize)); + in.skip(4); + VarStruct v = VarStruct.ice_read(in); + test(v.m.equals("test")); + test(in.readOptional(3, OptionalFormat.FSize)); + in.skip(4); + v = VarStruct.ice_read(in); + test(v.m.equals("test")); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { - if (reqParams) { - OneOptional p1 = new OneOptional(); - Initial.OpOneOptionalResult r = initial.opOneOptional(p1); - test(!r.returnValue.hasA() && !r.p3.hasA()); - r = initial.opOneOptionalAsync(p1).join(); - test(!r.returnValue.hasA() && !r.p3.hasA()); - - p1 = new OneOptional(58); - r = initial.opOneOptional(p1); - test(r.returnValue.getA() == 58 && r.p3.getA() == 58); - r = initial.opOneOptionalAsync(p1).join(); - test(r.returnValue.getA() == 58 && r.p3.getA() == 58); + OneOptional p1 = new OneOptional(); + Initial.OpOneOptionalResult r = initial.opOneOptional(p1); + test(!r.returnValue.hasA() && !r.p3.hasA()); + r = initial.opOneOptionalAsync(p1).join(); + test(!r.returnValue.hasA() && !r.p3.hasA()); + + p1 = new OneOptional(58); + r = initial.opOneOptional(p1); + test(r.returnValue.getA() == 58 && r.p3.getA() == 58); + r = initial.opOneOptionalAsync(p1).join(); + test(r.returnValue.getA() == 58 && r.p3.getA() == 58); - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeValue(p1); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opOneOptional", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - Wrapper p2cb = new Wrapper<>(); - in.readValue(v -> p2cb.value = v, OneOptional.class); - Wrapper p3cb = new Wrapper<>(); - in.readValue(v -> p3cb.value = v, OneOptional.class); - in.endEncapsulation(); - test(p2cb.value.getA() == 58 && p3cb.value.getA() == 58); - } + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeValue(p1); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opOneOptional", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + Wrapper p2cb = new Wrapper<>(); + in.readValue(v -> p2cb.value = v, OneOptional.class); + Wrapper p3cb = new Wrapper<>(); + in.readValue(v -> p3cb.value = v, OneOptional.class); + in.endEncapsulation(); + test(p2cb.value.getA() == 58 && p3cb.value.getA() == 58); } { @@ -1090,31 +1003,24 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opMyInterfaceProxyAsync(p1).join(); test(r.returnValue.get().equals(p1.get()) && r.p3.get().equals(p1.get())); - if (reqParams) { - Initial.OpMyInterfaceProxyReqResult rr = initial.opMyInterfaceProxyReq(p1.get()); - test(rr.returnValue.get().equals(p1.get()) && rr.p3.get().equals(p1.get())); - rr = initial.opMyInterfaceProxyReqAsync(p1.get()).join(); - test(rr.returnValue.get().equals(p1.get()) && rr.p3.get().equals(p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.FSize); - int pos = os.startSize(); - os.writeProxy(p1.get()); - os.endSize(pos); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opMyInterfaceProxyReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readProxy(1).get().equals(p1.get())); - test(in.readProxy(3).get().equals(p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.FSize); + int pos = os.startSize(); + os.writeProxy(p1.get()); + os.endSize(pos); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opMyInterfaceProxy", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readProxy(1).get().equals(p1.get())); + test(in.readProxy(3).get().equals(p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } out.println("ok"); @@ -1136,33 +1042,22 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { java.util.Arrays.equals(r.returnValue.get(), p1.get()) && java.util.Arrays.equals(r.p3.get(), p1.get())); - if (reqParams) { - Initial.OpByteSeqReqResult rr = initial.opByteSeqReq(p1.get()); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - rr = initial.opByteSeqReqAsync(p1.get()).join(); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeByteSeq(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opByteSeqReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(java.util.Arrays.equals(in.readByteSeq(1).get(), p1.get())); - test(java.util.Arrays.equals(in.readByteSeq(3).get(), p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeByteSeq(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opByteSeq", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(java.util.Arrays.equals(in.readByteSeq(1).get(), p1.get())); + test(java.util.Arrays.equals(in.readByteSeq(3).get(), p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1180,33 +1075,22 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { java.util.Arrays.equals(r.returnValue.get(), p1.get()) && java.util.Arrays.equals(r.p3.get(), p1.get())); - if (reqParams) { - Initial.OpBoolSeqReqResult rr = initial.opBoolSeqReq(p1.get()); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - rr = initial.opBoolSeqReqAsync(p1.get()).join(); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeBoolSeq(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opBoolSeqReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(java.util.Arrays.equals(in.readBoolSeq(1).get(), p1.get())); - test(java.util.Arrays.equals(in.readBoolSeq(3).get(), p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeBoolSeq(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opBoolSeq", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(java.util.Arrays.equals(in.readBoolSeq(1).get(), p1.get())); + test(java.util.Arrays.equals(in.readBoolSeq(3).get(), p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1225,34 +1109,23 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { java.util.Arrays.equals(r.returnValue.get(), p1.get()) && java.util.Arrays.equals(r.p3.get(), p1.get())); - if (reqParams) { - Initial.OpShortSeqReqResult rr = initial.opShortSeqReq(p1.get()); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - rr = initial.opShortSeqReqAsync(p1.get()).join(); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSize(p1.get().length * 2 + (p1.get().length > 254 ? 5 : 1)); - os.writeShortSeq(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opShortSeqReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(java.util.Arrays.equals(in.readShortSeq(1).get(), p1.get())); - test(java.util.Arrays.equals(in.readShortSeq(3).get(), p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSize(p1.get().length * 2 + (p1.get().length > 254 ? 5 : 1)); + os.writeShortSeq(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opShortSeq", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(java.util.Arrays.equals(in.readShortSeq(1).get(), p1.get())); + test(java.util.Arrays.equals(in.readShortSeq(3).get(), p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1271,34 +1144,23 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { java.util.Arrays.equals(r.returnValue.get(), p1.get()) && java.util.Arrays.equals(r.p3.get(), p1.get())); - if (reqParams) { - Initial.OpIntSeqReqResult rr = initial.opIntSeqReq(p1.get()); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - rr = initial.opIntSeqReqAsync(p1.get()).join(); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSize(p1.get().length * 4 + (p1.get().length > 254 ? 5 : 1)); - os.writeIntSeq(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opIntSeqReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(java.util.Arrays.equals(in.readIntSeq(1).get(), p1.get())); - test(java.util.Arrays.equals(in.readIntSeq(3).get(), p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSize(p1.get().length * 4 + (p1.get().length > 254 ? 5 : 1)); + os.writeIntSeq(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opIntSeq", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(java.util.Arrays.equals(in.readIntSeq(1).get(), p1.get())); + test(java.util.Arrays.equals(in.readIntSeq(3).get(), p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1317,34 +1179,23 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { java.util.Arrays.equals(r.returnValue.get(), p1.get()) && java.util.Arrays.equals(r.p3.get(), p1.get())); - if (reqParams) { - Initial.OpLongSeqReqResult rr = initial.opLongSeqReq(p1.get()); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - rr = initial.opLongSeqReqAsync(p1.get()).join(); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSize(p1.get().length * 8 + (p1.get().length > 254 ? 5 : 1)); - os.writeLongSeq(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opLongSeqReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(java.util.Arrays.equals(in.readLongSeq(1).get(), p1.get())); - test(java.util.Arrays.equals(in.readLongSeq(3).get(), p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSize(p1.get().length * 8 + (p1.get().length > 254 ? 5 : 1)); + os.writeLongSeq(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opLongSeq", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(java.util.Arrays.equals(in.readLongSeq(1).get(), p1.get())); + test(java.util.Arrays.equals(in.readLongSeq(3).get(), p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1363,34 +1214,23 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { java.util.Arrays.equals(r.returnValue.get(), p1.get()) && java.util.Arrays.equals(r.p3.get(), p1.get())); - if (reqParams) { - Initial.OpFloatSeqReqResult rr = initial.opFloatSeqReq(p1.get()); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - rr = initial.opFloatSeqReqAsync(p1.get()).join(); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSize(p1.get().length * 4 + (p1.get().length > 254 ? 5 : 1)); - os.writeFloatSeq(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opFloatSeqReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(java.util.Arrays.equals(in.readFloatSeq(1).get(), p1.get())); - test(java.util.Arrays.equals(in.readFloatSeq(3).get(), p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSize(p1.get().length * 4 + (p1.get().length > 254 ? 5 : 1)); + os.writeFloatSeq(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opFloatSeq", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(java.util.Arrays.equals(in.readFloatSeq(1).get(), p1.get())); + test(java.util.Arrays.equals(in.readFloatSeq(3).get(), p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1409,34 +1249,23 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { java.util.Arrays.equals(r.returnValue.get(), p1.get()) && java.util.Arrays.equals(r.p3.get(), p1.get())); - if (reqParams) { - Initial.OpDoubleSeqReqResult rr = initial.opDoubleSeqReq(p1.get()); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - rr = initial.opDoubleSeqReqAsync(p1.get()).join(); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSize(p1.get().length * 8 + (p1.get().length > 254 ? 5 : 1)); - os.writeDoubleSeq(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opDoubleSeqReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(java.util.Arrays.equals(in.readDoubleSeq(1).get(), p1.get())); - test(java.util.Arrays.equals(in.readDoubleSeq(3).get(), p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSize(p1.get().length * 8 + (p1.get().length > 254 ? 5 : 1)); + os.writeDoubleSeq(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opDoubleSeq", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(java.util.Arrays.equals(in.readDoubleSeq(1).get(), p1.get())); + test(java.util.Arrays.equals(in.readDoubleSeq(3).get(), p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1453,37 +1282,26 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opStringSeqAsync(p1).join(); test( java.util.Arrays.equals(r.returnValue.get(), p1.get()) - && java.util.Arrays.equals(r.p3.get(), p1.get())); - - if (reqParams) { - Initial.OpStringSeqReqResult rr = initial.opStringSeqReq(p1.get()); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); - rr = initial.opStringSeqReqAsync(p1.get()).join(); - test( - java.util.Arrays.equals(rr.returnValue.get(), p1.get()) - && java.util.Arrays.equals(rr.p3.get(), p1.get())); + && java.util.Arrays.equals(r.p3.get(), p1.get())); - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.FSize); - int pos = os.startSize(); - os.writeStringSeq(p1.get()); - os.endSize(pos); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opStringSeqReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(java.util.Arrays.equals(in.readStringSeq(1).get(), p1.get())); - test(java.util.Arrays.equals(in.readStringSeq(3).get(), p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.FSize); + int pos = os.startSize(); + os.writeStringSeq(p1.get()); + os.endSize(pos); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opStringSeq", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(java.util.Arrays.equals(in.readStringSeq(1).get(), p1.get())); + test(java.util.Arrays.equals(in.readStringSeq(3).get(), p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1498,52 +1316,43 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opSmallStructSeq(p1); for (int i = 0; i < p1.get().length; ++i) { test(r.p3.get()[i].equals(p1.get()[i])); + test(r.returnValue.get()[i].equals(p1.get()[i])); } r = initial.opSmallStructSeqAsync(p1).join(); for (int i = 0; i < p1.get().length; ++i) { + test(r.p3.get()[i].equals(p1.get()[i])); test(r.returnValue.get()[i].equals(p1.get()[i])); } - if (reqParams) { - Initial.OpSmallStructSeqReqResult rr = initial.opSmallStructSeqReq(p1.get()); - for (int i = 0; i < p1.get().length; ++i) { - test(rr.returnValue.get()[i].equals(p1.get()[i])); - } - rr = initial.opSmallStructSeqReqAsync(p1.get()).join(); - for (int i = 0; i < p1.get().length; ++i) { - test(rr.returnValue.get()[i].equals(p1.get()[i])); - } - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - SmallStructSeqHelper.write(os, p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opSmallStructSeqReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.VSize)); - SmallStruct[] arr = SmallStructSeqHelper.read(in); - for (int i = 0; i < p1.get().length; ++i) { - test(arr[i].equals(p1.get()[i])); - } - test(in.readOptional(3, OptionalFormat.VSize)); - arr = SmallStructSeqHelper.read(in); - for (int i = 0; i < p1.get().length; ++i) { - test(arr[i].equals(p1.get()[i])); - } - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + SmallStructSeqHelper.write(os, p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opSmallStructSeq", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.VSize)); + SmallStruct[] arr = SmallStructSeqHelper.read(in); + for (int i = 0; i < p1.get().length; ++i) { + test(arr[i].equals(p1.get()[i])); + } + test(in.readOptional(3, OptionalFormat.VSize)); + arr = SmallStructSeqHelper.read(in); + for (int i = 0; i < p1.get().length; ++i) { + test(arr[i].equals(p1.get()[i])); + } + in.endEncapsulation(); - // Check the outEncaps size matches the expected size, 6 bytes for the encapsulation, plus - // 12 bytes - // for each sequence (1 byte tag, 1 byte size, 10 byte contents) - test(inv.outParams.length == 12 + 12 + 6); + // Check the outEncaps size matches the expected size, 6 bytes for the encapsulation, plus + // 12 bytes + // for each sequence (1 byte tag, 1 byte size, 10 byte contents) + test(inv.outParams.length == 12 + 12 + 6); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1560,36 +1369,29 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opSmallStructListAsync(p1).join(); test(r.returnValue.get().equals(p1.get())); - if (reqParams) { - Initial.OpSmallStructListReqResult rr = initial.opSmallStructListReq(p1.get()); - test(rr.returnValue.get().equals(p1.get())); - rr = initial.opSmallStructListReqAsync(p1.get()).join(); - test(rr.returnValue.get().equals(p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSize(p1.get().size() + (p1.get().size() > 254 ? 5 : 1)); - SmallStructListHelper.write(os, p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opSmallStructListReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.VSize)); - in.skipSize(); - java.util.List arr = SmallStructListHelper.read(in); - test(arr.equals(p1.get())); - test(in.readOptional(3, OptionalFormat.VSize)); - in.skipSize(); - arr = SmallStructListHelper.read(in); - test(arr.equals(p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSize(p1.get().size() + (p1.get().size() > 254 ? 5 : 1)); + SmallStructListHelper.write(os, p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opSmallStructList", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.VSize)); + in.skipSize(); + java.util.List arr = SmallStructListHelper.read(in); + test(arr.equals(p1.get())); + test(in.readOptional(3, OptionalFormat.VSize)); + in.skipSize(); + arr = SmallStructListHelper.read(in); + test(arr.equals(p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1603,51 +1405,42 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { } r = initial.opFixedStructSeq(p1); for (int i = 0; i < p1.get().length; ++i) { + test(r.p3.get()[i].equals(p1.get()[i])); test(r.returnValue.get()[i].equals(p1.get()[i])); } r = initial.opFixedStructSeqAsync(p1).join(); for (int i = 0; i < p1.get().length; ++i) { + test(r.p3.get()[i].equals(p1.get()[i])); test(r.returnValue.get()[i].equals(p1.get()[i])); } - if (reqParams) { - Initial.OpFixedStructSeqReqResult rr = initial.opFixedStructSeqReq(p1.get()); - for (int i = 0; i < p1.get().length; ++i) { - test(rr.returnValue.get()[i].equals(p1.get()[i])); - } - rr = initial.opFixedStructSeqReqAsync(p1.get()).join(); - for (int i = 0; i < p1.get().length; ++i) { - test(rr.returnValue.get()[i].equals(p1.get()[i])); - } - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSize(p1.get().length * 4 + (p1.get().length > 254 ? 5 : 1)); - FixedStructSeqHelper.write(os, p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opFixedStructSeqReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.VSize)); - in.skipSize(); - FixedStruct[] arr = FixedStructSeqHelper.read(in); - for (int i = 0; i < p1.get().length; ++i) { - test(arr[i].equals(p1.get()[i])); - } - test(in.readOptional(3, OptionalFormat.VSize)); - in.skipSize(); - arr = FixedStructSeqHelper.read(in); - for (int i = 0; i < p1.get().length; ++i) { - test(arr[i].equals(p1.get()[i])); - } - in.endEncapsulation(); - - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSize(p1.get().length * 4 + (p1.get().length > 254 ? 5 : 1)); + FixedStructSeqHelper.write(os, p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opFixedStructSeq", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.VSize)); + in.skipSize(); + FixedStruct[] arr = FixedStructSeqHelper.read(in); + for (int i = 0; i < p1.get().length; ++i) { + test(arr[i].equals(p1.get()[i])); + } + test(in.readOptional(3, OptionalFormat.VSize)); + in.skipSize(); + arr = FixedStructSeqHelper.read(in); + for (int i = 0; i < p1.get().length; ++i) { + test(arr[i].equals(p1.get()[i])); } + in.endEncapsulation(); + + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1660,40 +1453,33 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { p1.get().add(new FixedStruct()); } r = initial.opFixedStructList(p1); - test(r.returnValue.get().equals(p1.get())); + test(r.returnValue.get().equals(p1.get()) && r.p3.get().equals(p1.get())); r = initial.opFixedStructListAsync(p1).join(); - test(r.returnValue.get().equals(p1.get())); - - if (reqParams) { - Initial.OpFixedStructListReqResult rr = initial.opFixedStructListReq(p1.get()); - test(rr.returnValue.get().equals(p1.get())); - rr = initial.opFixedStructListReqAsync(p1.get()).join(); - test(rr.returnValue.get().equals(p1.get())); + test(r.returnValue.get().equals(p1.get()) && r.p3.get().equals(p1.get())); - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSize(p1.get().size() * 4 + (p1.get().size() > 254 ? 5 : 1)); - FixedStructListHelper.write(os, p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opFixedStructListReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.VSize)); - in.skipSize(); - java.util.List arr = FixedStructListHelper.read(in); - test(arr.equals(p1.get())); - test(in.readOptional(3, OptionalFormat.VSize)); - in.skipSize(); - arr = FixedStructListHelper.read(in); - test(arr.equals(p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSize(p1.get().size() * 4 + (p1.get().size() > 254 ? 5 : 1)); + FixedStructListHelper.write(os, p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opFixedStructList", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.VSize)); + in.skipSize(); + java.util.List arr = FixedStructListHelper.read(in); + test(arr.equals(p1.get())); + test(in.readOptional(3, OptionalFormat.VSize)); + in.skipSize(); + arr = FixedStructListHelper.read(in); + test(arr.equals(p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1707,52 +1493,43 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { } r = initial.opVarStructSeq(p1); for (int i = 0; i < p1.get().length; ++i) { + test(r.p3.get()[i].equals(p1.get()[i])); test(r.returnValue.get()[i].equals(p1.get()[i])); } r = initial.opVarStructSeqAsync(p1).join(); for (int i = 0; i < p1.get().length; ++i) { + test(r.p3.get()[i].equals(p1.get()[i])); test(r.returnValue.get()[i].equals(p1.get()[i])); } - if (reqParams) { - Initial.OpVarStructSeqReqResult rr = initial.opVarStructSeqReq(p1.get()); - for (int i = 0; i < p1.get().length; ++i) { - test(rr.returnValue.get()[i].equals(p1.get()[i])); - } - rr = initial.opVarStructSeqReqAsync(p1.get()).join(); - for (int i = 0; i < p1.get().length; ++i) { - test(rr.returnValue.get()[i].equals(p1.get()[i])); - } - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.FSize); - int pos = os.startSize(); - VarStructSeqHelper.write(os, p1.get()); - os.endSize(pos); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opVarStructSeqReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.FSize)); - in.skip(4); - VarStruct[] arr = VarStructSeqHelper.read(in); - for (int i = 0; i < p1.get().length; ++i) { - test(arr[i].equals(p1.get()[i])); - } - test(in.readOptional(3, OptionalFormat.FSize)); - in.skip(4); - arr = VarStructSeqHelper.read(in); - for (int i = 0; i < p1.get().length; ++i) { - test(arr[i].equals(p1.get()[i])); - } - in.endEncapsulation(); - - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.FSize); + int pos = os.startSize(); + VarStructSeqHelper.write(os, p1.get()); + os.endSize(pos); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opVarStructSeq", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.FSize)); + in.skip(4); + VarStruct[] arr = VarStructSeqHelper.read(in); + for (int i = 0; i < p1.get().length; ++i) { + test(arr[i].equals(p1.get()[i])); + } + test(in.readOptional(3, OptionalFormat.FSize)); + in.skip(4); + arr = VarStructSeqHelper.read(in); + for (int i = 0; i < p1.get().length; ++i) { + test(arr[i].equals(p1.get()[i])); } + in.endEncapsulation(); + + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } if (supportsJavaSerializable) { @@ -1766,33 +1543,26 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opSerializableAsync(p1).join(); test(r.returnValue.get().equals(p1.get()) && r.p3.get().equals(p1.get())); - if (reqParams) { - Initial.OpSerializableReqResult rr = initial.opSerializableReq(p1.get()); - test(rr.returnValue.get().equals(p1.get()) && rr.p3.get().equals(p1.get())); - rr = initial.opSerializableReqAsync(p1.get()).join(); - test(rr.returnValue.get().equals(p1.get()) && rr.p3.get().equals(p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSerializable(p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opSerializableReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.VSize)); - SerializableClass sc = in.readSerializable(SerializableClass.class); - test(sc.equals(p1.get())); - test(in.readOptional(3, OptionalFormat.VSize)); - sc = in.readSerializable(SerializableClass.class); - test(sc.equals(p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSerializable(p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opSerializable", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.VSize)); + SerializableClass sc = in.readSerializable(SerializableClass.class); + test(sc.equals(p1.get())); + test(in.readOptional(3, OptionalFormat.VSize)); + sc = in.readSerializable(SerializableClass.class); + test(sc.equals(p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } out.println("ok"); @@ -1811,36 +1581,29 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opIntIntDictAsync(p1).join(); test(r.returnValue.get().equals(p1.get()) && r.p3.get().equals(p1.get())); - if (reqParams) { - Initial.OpIntIntDictReqResult rr = initial.opIntIntDictReq(p1.get()); - test(rr.returnValue.get().equals(p1.get()) && rr.p3.get().equals(p1.get())); - rr = initial.opIntIntDictReqAsync(p1.get()).join(); - test(rr.returnValue.get().equals(p1.get()) && rr.p3.get().equals(p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.VSize); - os.writeSize(p1.get().size() * 8 + (p1.get().size() > 254 ? 5 : 1)); - IntIntDictHelper.write(os, p1.get()); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opIntIntDictReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.VSize)); - in.skipSize(); - java.util.Map m = IntIntDictHelper.read(in); - test(m.equals(p1.get())); - test(in.readOptional(3, OptionalFormat.VSize)); - in.skipSize(); - m = IntIntDictHelper.read(in); - test(m.equals(p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.VSize); + os.writeSize(p1.get().size() * 8 + (p1.get().size() > 254 ? 5 : 1)); + IntIntDictHelper.write(os, p1.get()); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opIntIntDict", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.VSize)); + in.skipSize(); + java.util.Map m = IntIntDictHelper.read(in); + test(m.equals(p1.get())); + test(in.readOptional(3, OptionalFormat.VSize)); + in.skipSize(); + m = IntIntDictHelper.read(in); + test(m.equals(p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1856,37 +1619,30 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { r = initial.opStringIntDictAsync(p1).join(); test(r.returnValue.get().equals(p1.get()) && r.p3.get().equals(p1.get())); - if (reqParams) { - Initial.OpStringIntDictReqResult rr = initial.opStringIntDictReq(p1.get()); - test(rr.returnValue.get().equals(p1.get()) && rr.p3.get().equals(p1.get())); - rr = initial.opStringIntDictReqAsync(p1.get()).join(); - test(rr.returnValue.get().equals(p1.get()) && rr.p3.get().equals(p1.get())); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.FSize); - int pos = os.startSize(); - StringIntDictHelper.write(os, p1.get()); - os.endSize(pos); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opStringIntDictReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.FSize)); - in.skip(4); - java.util.Map m = StringIntDictHelper.read(in); - test(m.equals(p1.get())); - test(in.readOptional(3, OptionalFormat.FSize)); - in.skip(4); - m = StringIntDictHelper.read(in); - test(m.equals(p1.get())); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.FSize); + int pos = os.startSize(); + StringIntDictHelper.write(os, p1.get()); + os.endSize(pos); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opStringIntDict", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.FSize)); + in.skip(4); + java.util.Map m = StringIntDictHelper.read(in); + test(m.equals(p1.get())); + test(in.readOptional(3, OptionalFormat.FSize)); + in.skip(4); + m = StringIntDictHelper.read(in); + test(m.equals(p1.get())); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { @@ -1905,39 +1661,30 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { test(r.returnValue.get().get(1).getA() == 15 && r.p3.get().get(1).getA() == 15); test(r.returnValue.get().get(2).getA() == 12 && r.p3.get().get(2).getA() == 12); - if (reqParams) { - Initial.OpIntOneOptionalDictReqResult rr = initial.opIntOneOptionalDictReq(p1.get()); - test(rr.returnValue.get().get(1).getA() == 15 && rr.p3.get().get(1).getA() == 15); - test(rr.returnValue.get().get(2).getA() == 12 && rr.p3.get().get(2).getA() == 12); - rr = initial.opIntOneOptionalDictReqAsync(p1.get()).join(); - test(rr.returnValue.get().get(1).getA() == 15 && rr.p3.get().get(1).getA() == 15); - test(rr.returnValue.get().get(2).getA() == 12 && rr.p3.get().get(2).getA() == 12); - - os = new OutputStream(communicator); - os.startEncapsulation(); - os.writeOptional(2, OptionalFormat.FSize); - int pos = os.startSize(); - IntOneOptionalDictHelper.write(os, p1.get()); - os.endSize(pos); - os.endEncapsulation(); - inEncaps = os.finished(); - inv = initial.ice_invoke("opIntOneOptionalDictReq", OperationMode.Normal, inEncaps); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - test(in.readOptional(1, OptionalFormat.FSize)); - in.skip(4); - java.util.Map m = IntOneOptionalDictHelper.read(in); - test(m.get(1).getA() == 15 && m.get(2).getA() == 12); - test(in.readOptional(3, OptionalFormat.FSize)); - in.skip(4); - m = IntOneOptionalDictHelper.read(in); - test(m.get(1).getA() == 15 && m.get(2).getA() == 12); - in.endEncapsulation(); + os = new OutputStream(communicator); + os.startEncapsulation(); + os.writeOptional(2, OptionalFormat.FSize); + int pos = os.startSize(); + IntOneOptionalDictHelper.write(os, p1.get()); + os.endSize(pos); + os.endEncapsulation(); + inEncaps = os.finished(); + inv = initial.ice_invoke("opIntOneOptionalDict", OperationMode.Normal, inEncaps); + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + test(in.readOptional(1, OptionalFormat.FSize)); + in.skip(4); + java.util.Map m = IntOneOptionalDictHelper.read(in); + test(m.get(1).getA() == 15 && m.get(2).getA() == 12); + test(in.readOptional(3, OptionalFormat.FSize)); + in.skip(4); + m = IntOneOptionalDictHelper.read(in); + test(m.get(1).getA() == 15 && m.get(2).getA() == 12); + in.endEncapsulation(); - in = new InputStream(communicator, inv.outParams); - in.startEncapsulation(); - in.endEncapsulation(); - } + in = new InputStream(communicator, inv.outParams); + in.startEncapsulation(); + in.endEncapsulation(); } { diff --git a/java/test/src/main/java/test/Ice/optional/InitialI.java b/java/test/src/main/java/test/Ice/optional/InitialI.java index fb90ad2d115..a1b781a522f 100644 --- a/java/test/src/main/java/test/Ice/optional/InitialI.java +++ b/java/test/src/main/java/test/Ice/optional/InitialI.java @@ -78,43 +78,19 @@ public Initial.OpByteResult opByte(Optional p1, Current current) { return new Initial.OpByteResult(p1, p1); } - @Override - public Initial.OpByteReqResult opByteReq(Optional p1, Current current) { - return new Initial.OpByteReqResult(p1, p1); - } - @Override public Initial.OpBoolResult opBool(Optional p1, Current current) { return new Initial.OpBoolResult(p1, p1); } - @Override - public Initial.OpBoolReqResult opBoolReq(Optional p1, Current current) { - return new Initial.OpBoolReqResult(p1, p1); - } - @Override public Initial.OpShortResult opShort(Optional p1, Current current) { return new Initial.OpShortResult(p1, p1); } - @Override - public Initial.OpShortReqResult opShortReq(Optional p1, Current current) { - return new Initial.OpShortReqResult(p1, p1); - } - @Override public Initial.OpIntResult opInt(OptionalInt p1, Current current) { - if (p1.isPresent()) { - return new Initial.OpIntResult(p1.getAsInt(), p1.getAsInt()); - } else { - return new Initial.OpIntResult(p1, p1); - } - } - - @Override - public Initial.OpIntReqResult opIntReq(OptionalInt p1, Current current) { - return new Initial.OpIntReqResult(p1, p1); + return new Initial.OpIntResult(p1, p1); } @Override @@ -122,23 +98,9 @@ public Initial.OpLongResult opLong(OptionalLong p1, Current current) { return new Initial.OpLongResult(p1, p1); } - @Override - public Initial.OpLongReqResult opLongReq(OptionalLong p1, Current current) { - return new Initial.OpLongReqResult(p1, p1); - } - @Override public Initial.OpFloatResult opFloat(Optional p1, Current current) { - if (p1.isPresent()) { - return new Initial.OpFloatResult(p1.get(), p1.get()); - } else { - return new Initial.OpFloatResult(p1, p1); - } - } - - @Override - public Initial.OpFloatReqResult opFloatReq(Optional p1, Current current) { - return new Initial.OpFloatReqResult(p1, p1); + return new Initial.OpFloatResult(p1, p1); } @Override @@ -146,34 +108,14 @@ public Initial.OpDoubleResult opDouble(OptionalDouble p1, Current current) { return new Initial.OpDoubleResult(p1, p1); } - @Override - public Initial.OpDoubleReqResult opDoubleReq(OptionalDouble p1, Current current) { - return new Initial.OpDoubleReqResult(p1, p1); - } - @Override public Initial.OpStringResult opString(Optional p1, Current current) { return new Initial.OpStringResult(p1, p1); } - @Override - public Initial.OpStringReqResult opStringReq(Optional p1, Current current) { - return new Initial.OpStringReqResult(p1, p1); - } - @Override public Initial.OpMyEnumResult opMyEnum(Optional p1, Current current) { - if (p1.isPresent()) { - return new Initial.OpMyEnumResult(p1.get(), p1.get()); - } else { - MyEnum e = null; - return new Initial.OpMyEnumResult(e, e); - } - } - - @Override - public Initial.OpMyEnumReqResult opMyEnumReq(Optional p1, Current current) { - return new Initial.OpMyEnumReqResult(p1, p1); + return new Initial.OpMyEnumResult(p1, p1); } @Override @@ -181,45 +123,22 @@ public Initial.OpSmallStructResult opSmallStruct(Optional p1, Curre return new Initial.OpSmallStructResult(p1, p1); } - @Override - public Initial.OpSmallStructReqResult opSmallStructReq( - Optional p1, Current current) { - return new Initial.OpSmallStructReqResult(p1, p1); - } - @Override public Initial.OpFixedStructResult opFixedStruct(Optional p1, Current current) { return new Initial.OpFixedStructResult(p1, p1); } - @Override - public Initial.OpFixedStructReqResult opFixedStructReq( - Optional p1, Current current) { - return new Initial.OpFixedStructReqResult(p1, p1); - } - @Override public Initial.OpVarStructResult opVarStruct(Optional p1, Current current) { return new Initial.OpVarStructResult(p1, p1); } - @Override - public Initial.OpVarStructReqResult opVarStructReq(Optional p1, Current current) { - return new Initial.OpVarStructReqResult(p1, p1); - } - @Override public Initial.OpMyInterfaceProxyResult opMyInterfaceProxy( Optional p1, Current current) { return new Initial.OpMyInterfaceProxyResult(p1, p1); } - @Override - public Initial.OpMyInterfaceProxyReqResult opMyInterfaceProxyReq( - Optional p1, Current current) { - return new Initial.OpMyInterfaceProxyReqResult(p1, p1); - } - @Override public Initial.OpOneOptionalResult opOneOptional(OneOptional p1, Current current) { return new Initial.OpOneOptionalResult(p1, p1); @@ -230,188 +149,94 @@ public Initial.OpByteSeqResult opByteSeq(Optional p1, Current current) { return new Initial.OpByteSeqResult(p1, p1); } - @Override - public Initial.OpByteSeqReqResult opByteSeqReq(Optional p1, Current current) { - return new Initial.OpByteSeqReqResult(p1, p1); - } - @Override public Initial.OpBoolSeqResult opBoolSeq(Optional p1, Current current) { return new Initial.OpBoolSeqResult(p1, p1); } - @Override - public Initial.OpBoolSeqReqResult opBoolSeqReq(Optional p1, Current current) { - return new Initial.OpBoolSeqReqResult(p1, p1); - } - @Override public Initial.OpShortSeqResult opShortSeq(Optional p1, Current current) { return new Initial.OpShortSeqResult(p1, p1); } - @Override - public Initial.OpShortSeqReqResult opShortSeqReq(Optional p1, Current current) { - return new Initial.OpShortSeqReqResult(p1, p1); - } - @Override public Initial.OpIntSeqResult opIntSeq(Optional p1, Current current) { return new Initial.OpIntSeqResult(p1, p1); } - @Override - public Initial.OpIntSeqReqResult opIntSeqReq(Optional p1, Current current) { - return new Initial.OpIntSeqReqResult(p1, p1); - } - @Override public Initial.OpLongSeqResult opLongSeq(Optional p1, Current current) { return new Initial.OpLongSeqResult(p1, p1); } - @Override - public Initial.OpLongSeqReqResult opLongSeqReq(Optional p1, Current current) { - return new Initial.OpLongSeqReqResult(p1, p1); - } - @Override public Initial.OpFloatSeqResult opFloatSeq(Optional p1, Current current) { return new Initial.OpFloatSeqResult(p1, p1); } - @Override - public Initial.OpFloatSeqReqResult opFloatSeqReq(Optional p1, Current current) { - return new Initial.OpFloatSeqReqResult(p1, p1); - } - @Override public Initial.OpDoubleSeqResult opDoubleSeq(Optional p1, Current current) { return new Initial.OpDoubleSeqResult(p1, p1); } - @Override - public Initial.OpDoubleSeqReqResult opDoubleSeqReq(Optional p1, Current current) { - return new Initial.OpDoubleSeqReqResult(p1, p1); - } - @Override public Initial.OpStringSeqResult opStringSeq(Optional p1, Current current) { return new Initial.OpStringSeqResult(p1, p1); } - @Override - public Initial.OpStringSeqReqResult opStringSeqReq(Optional p1, Current current) { - return new Initial.OpStringSeqReqResult(p1, p1); - } - @Override public Initial.OpSmallStructSeqResult opSmallStructSeq( Optional p1, Current current) { return new Initial.OpSmallStructSeqResult(p1, p1); } - @Override - public Initial.OpSmallStructSeqReqResult opSmallStructSeqReq( - Optional p1, Current current) { - return new Initial.OpSmallStructSeqReqResult(p1, p1); - } - @Override public Initial.OpSmallStructListResult opSmallStructList( Optional> p1, Current current) { return new Initial.OpSmallStructListResult(p1, p1); } - @Override - public Initial.OpSmallStructListReqResult opSmallStructListReq( - Optional> p1, Current current) { - return new Initial.OpSmallStructListReqResult(p1, p1); - } - @Override public Initial.OpFixedStructSeqResult opFixedStructSeq( Optional p1, Current current) { return new Initial.OpFixedStructSeqResult(p1, p1); } - @Override - public Initial.OpFixedStructSeqReqResult opFixedStructSeqReq( - Optional p1, Current current) { - return new Initial.OpFixedStructSeqReqResult(p1, p1); - } - @Override public Initial.OpFixedStructListResult opFixedStructList( Optional> p1, Current current) { return new Initial.OpFixedStructListResult(p1, p1); } - @Override - public Initial.OpFixedStructListReqResult opFixedStructListReq( - Optional> p1, Current current) { - return new Initial.OpFixedStructListReqResult(p1, p1); - } - @Override public Initial.OpVarStructSeqResult opVarStructSeq(Optional p1, Current current) { return new Initial.OpVarStructSeqResult(p1, p1); } - @Override - public Initial.OpVarStructSeqReqResult opVarStructSeqReq( - Optional p1, Current current) { - return new Initial.OpVarStructSeqReqResult(p1, p1); - } - @Override public Initial.OpSerializableResult opSerializable( Optional p1, Current current) { return new Initial.OpSerializableResult(p1, p1); } - @Override - public Initial.OpSerializableReqResult opSerializableReq( - Optional p1, Current current) { - return new Initial.OpSerializableReqResult(p1, p1); - } - @Override public Initial.OpIntIntDictResult opIntIntDict( Optional> p1, Current current) { return new Initial.OpIntIntDictResult(p1, p1); } - @Override - public Initial.OpIntIntDictReqResult opIntIntDictReq( - Optional> p1, Current current) { - return new Initial.OpIntIntDictReqResult(p1, p1); - } - @Override public Initial.OpStringIntDictResult opStringIntDict( Optional> p1, Current current) { return new Initial.OpStringIntDictResult(p1, p1); } - @Override - public Initial.OpStringIntDictReqResult opStringIntDictReq( - Optional> p1, Current current) { - return new Initial.OpStringIntDictReqResult(p1, p1); - } - @Override public Initial.OpIntOneOptionalDictResult opIntOneOptionalDict( Optional> p1, Current current) { return new Initial.OpIntOneOptionalDictResult(p1, p1); } - @Override - public Initial.OpIntOneOptionalDictReqResult opIntOneOptionalDictReq( - Optional> p1, Current current) { - return new Initial.OpIntOneOptionalDictReqResult(p1, p1); - } - @Override public void opClassAndUnknownOptional(A p, Current current) {} @@ -454,11 +279,6 @@ public OpMDict2MarshaledResult opMDict2( return new OpMDict2MarshaledResult(p1, p1, current); } - @Override - public boolean supportsRequiredParams(Current current) { - return true; - } - @Override public boolean supportsJavaSerializable(Current current) { return true; diff --git a/java/test/src/main/java/test/Ice/optional/Test.ice b/java/test/src/main/java/test/Ice/optional/Test.ice index d6db8c62e4b..fbdd262ad12 100644 --- a/java/test/src/main/java/test/Ice/optional/Test.ice +++ b/java/test/src/main/java/test/Ice/optional/Test.ice @@ -196,110 +196,67 @@ interface Initial void opRequiredException(optional(1) int a, optional(2) string b) throws OptionalException; - ["java:optional"] optional(1) byte opByte(optional(2) byte p1, out optional(3) byte p3); - optional(1) byte opByteReq(optional(2) byte p1, out optional(3) byte p3); + optional(1) byte opByte(optional(2) byte p1, out optional(3) byte p3); - ["java:optional"] optional(1) bool opBool(optional(2) bool p1, out optional(3) bool p3); - optional(1) bool opBoolReq(optional(2) bool p1, out optional(3) bool p3); + optional(1) bool opBool(optional(2) bool p1, out optional(3) bool p3); - ["java:optional"] optional(1) short opShort(optional(2) short p1, out optional(3) short p3); - optional(1) short opShortReq(optional(2) short p1, out optional(3) short p3); + optional(1) short opShort(optional(2) short p1, out optional(3) short p3); - ["java:optional"] optional(1) int opInt(optional(2) int p1, out optional(3) int p3); - optional(1) int opIntReq(optional(2) int p1, out optional(3) int p3); + optional(1) int opInt(optional(2) int p1, out optional(3) int p3); - ["java:optional"] optional(3) long opLong(optional(1) long p1, out optional(2) long p3); - optional(3) long opLongReq(optional(1) long p1, out optional(2) long p3); + optional(3) long opLong(optional(1) long p1, out optional(2) long p3); - ["java:optional"] optional(1) float opFloat(optional(2) float p1, out optional(3) float p3); - optional(1) float opFloatReq(optional(2) float p1, out optional(3) float p3); + optional(1) float opFloat(optional(2) float p1, out optional(3) float p3); - ["java:optional"] optional(1) double opDouble(optional(2) double p1, out optional(3) double p3); - optional(1) double opDoubleReq(optional(2) double p1, out optional(3) double p3); + optional(1) double opDouble(optional(2) double p1, out optional(3) double p3); - ["java:optional"] optional(1) string opString(optional(2) string p1, out optional(3) string p3); - optional(1) string opStringReq(optional(2) string p1, out optional(3) string p3); + optional(1) string opString(optional(2) string p1, out optional(3) string p3); - ["java:optional"] optional(1) MyEnum opMyEnum(optional(2) MyEnum p1, out optional(3) MyEnum p3); - optional(1) MyEnum opMyEnumReq(optional(2) MyEnum p1, out optional(3) MyEnum p3); + optional(1) MyEnum opMyEnum(optional(2) MyEnum p1, out optional(3) MyEnum p3); - ["java:optional"] optional(1) SmallStruct opSmallStruct(optional(2) SmallStruct p1, out optional(3) SmallStruct p3); - optional(1) SmallStruct opSmallStructReq(optional(2) SmallStruct p1, out optional(3) SmallStruct p3); + optional(1) SmallStruct opSmallStruct(optional(2) SmallStruct p1, out optional(3) SmallStruct p3); - ["java:optional"] optional(1) FixedStruct opFixedStruct(optional(2) FixedStruct p1, out optional(3) FixedStruct p3); - optional(1) FixedStruct opFixedStructReq(optional(2) FixedStruct p1, out optional(3) FixedStruct p3); + optional(1) FixedStruct opFixedStruct(optional(2) FixedStruct p1, out optional(3) FixedStruct p3); - ["java:optional"] optional(1) VarStruct opVarStruct(optional(2) VarStruct p1, out optional(3) VarStruct p3); - optional(1) VarStruct opVarStructReq(optional(2) VarStruct p1, out optional(3) VarStruct p3); + optional(1) VarStruct opVarStruct(optional(2) VarStruct p1, out optional(3) VarStruct p3); - ["java:optional"] optional(1) MyInterface* opMyInterfaceProxy(optional(2) MyInterface* p1, - out optional(3) MyInterface* p3); - optional(1) MyInterface* opMyInterfaceProxyReq(optional(2) MyInterface* p1, out optional(3) MyInterface* p3); + optional(1) MyInterface* opMyInterfaceProxy(optional(2) MyInterface* p1, out optional(3) MyInterface* p3); OneOptional opOneOptional(OneOptional p1, out OneOptional p3); - ["java:optional"] optional(1) ByteSeq opByteSeq(optional(2) ByteSeq p1, out optional(3) ByteSeq p3); - optional(1) ByteSeq opByteSeqReq(optional(2) ByteSeq p1, out optional(3) ByteSeq p3); + optional(1) ByteSeq opByteSeq(optional(2) ByteSeq p1, out optional(3) ByteSeq p3); - ["java:optional"] optional(1) BoolSeq opBoolSeq(optional(2) BoolSeq p1, out optional(3) BoolSeq p3); - optional(1) BoolSeq opBoolSeqReq(optional(2) BoolSeq p1, out optional(3) BoolSeq p3); + optional(1) BoolSeq opBoolSeq(optional(2) BoolSeq p1, out optional(3) BoolSeq p3); - ["java:optional"] optional(1) ShortSeq opShortSeq(optional(2) ShortSeq p1, out optional(3) ShortSeq p3); - optional(1) ShortSeq opShortSeqReq(optional(2) ShortSeq p1, out optional(3) ShortSeq p3); + optional(1) ShortSeq opShortSeq(optional(2) ShortSeq p1, out optional(3) ShortSeq p3); - ["java:optional"] optional(1) IntSeq opIntSeq(optional(2) IntSeq p1, out optional(3) IntSeq p3); - optional(1) IntSeq opIntSeqReq(optional(2) IntSeq p1, out optional(3) IntSeq p3); + optional(1) IntSeq opIntSeq(optional(2) IntSeq p1, out optional(3) IntSeq p3); - ["java:optional"] optional(1) LongSeq opLongSeq(optional(2) LongSeq p1, out optional(3) LongSeq p3); - optional(1) LongSeq opLongSeqReq(optional(2) LongSeq p1, out optional(3) LongSeq p3); + optional(1) LongSeq opLongSeq(optional(2) LongSeq p1, out optional(3) LongSeq p3); - ["java:optional"] optional(1) FloatSeq opFloatSeq(optional(2) FloatSeq p1, out optional(3) FloatSeq p3); - optional(1) FloatSeq opFloatSeqReq(optional(2) FloatSeq p1, out optional(3) FloatSeq p3); + optional(1) FloatSeq opFloatSeq(optional(2) FloatSeq p1, out optional(3) FloatSeq p3); - ["java:optional"] optional(1) DoubleSeq opDoubleSeq(optional(2) DoubleSeq p1, out optional(3) DoubleSeq p3); - optional(1) DoubleSeq opDoubleSeqReq(optional(2) DoubleSeq p1, out optional(3) DoubleSeq p3); + optional(1) DoubleSeq opDoubleSeq(optional(2) DoubleSeq p1, out optional(3) DoubleSeq p3); - ["java:optional"] optional(1) StringSeq opStringSeq(optional(2) StringSeq p1, out optional(3) StringSeq p3); - optional(1) StringSeq opStringSeqReq(optional(2) StringSeq p1, out optional(3) StringSeq p3); + optional(1) StringSeq opStringSeq(optional(2) StringSeq p1, out optional(3) StringSeq p3); - ["java:optional"] optional(1) SmallStructSeq opSmallStructSeq(optional(2) SmallStructSeq p1, - out optional(3) SmallStructSeq p3); - optional(1) SmallStructSeq opSmallStructSeqReq(optional(2) SmallStructSeq p1, out optional(3) SmallStructSeq p3); + optional(1) SmallStructSeq opSmallStructSeq(optional(2) SmallStructSeq p1, out optional(3) SmallStructSeq p3); - ["java:optional"] optional(1) SmallStructList opSmallStructList(optional(2) SmallStructList p1, - out optional(3) SmallStructList p3); - optional(1) SmallStructList opSmallStructListReq(optional(2) SmallStructList p1, - out optional(3) SmallStructList p3); + optional(1) SmallStructList opSmallStructList(optional(2) SmallStructList p1, out optional(3) SmallStructList p3); - ["java:optional"] optional(1) FixedStructSeq opFixedStructSeq(optional(2) FixedStructSeq p1, - out optional(3) FixedStructSeq p3); - optional(1) FixedStructSeq opFixedStructSeqReq(optional(2) FixedStructSeq p1, out optional(3) FixedStructSeq p3); + optional(1) FixedStructSeq opFixedStructSeq(optional(2) FixedStructSeq p1, out optional(3) FixedStructSeq p3); - ["java:optional"] optional(1) FixedStructList opFixedStructList(optional(2) FixedStructList p1, - out optional(3) FixedStructList p3); - optional(1) FixedStructList opFixedStructListReq(optional(2) FixedStructList p1, - out optional(3) FixedStructList p3); + optional(1) FixedStructList opFixedStructList(optional(2) FixedStructList p1, out optional(3) FixedStructList p3); - ["java:optional"] optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1, - out optional(3) VarStructSeq p3); - optional(1) VarStructSeq opVarStructSeqReq(optional(2) VarStructSeq p1, out optional(3) VarStructSeq p3); + optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1, out optional(3) VarStructSeq p3); - ["java:optional"] optional(1) Serializable opSerializable(optional(2) Serializable p1, - out optional(3) Serializable p3); - optional(1) Serializable opSerializableReq(optional(2) Serializable p1, out optional(3) Serializable p3); + optional(1) Serializable opSerializable(optional(2) Serializable p1, out optional(3) Serializable p3); - ["java:optional"] optional(1) IntIntDict opIntIntDict(optional(2) IntIntDict p1, out optional(3) IntIntDict p3); - optional(1) IntIntDict opIntIntDictReq(optional(2) IntIntDict p1, out optional(3) IntIntDict p3); + optional(1) IntIntDict opIntIntDict(optional(2) IntIntDict p1, out optional(3) IntIntDict p3); - ["java:optional"] optional(1) StringIntDict opStringIntDict(optional(2) StringIntDict p1, - out optional(3) StringIntDict p3); - optional(1) StringIntDict opStringIntDictReq(optional(2) StringIntDict p1, out optional(3) StringIntDict p3); + optional(1) StringIntDict opStringIntDict(optional(2) StringIntDict p1, out optional(3) StringIntDict p3); - ["java:optional"] optional(1) IntOneOptionalDict opIntOneOptionalDict(optional(2) IntOneOptionalDict p1, - out optional(3) IntOneOptionalDict p3); - - optional(1) IntOneOptionalDict opIntOneOptionalDictReq(optional(2) IntOneOptionalDict p1, - out optional(3) IntOneOptionalDict p3); + optional(1) IntOneOptionalDict opIntOneOptionalDict(optional(2) IntOneOptionalDict p1, out optional(3) IntOneOptionalDict p3); void opClassAndUnknownOptional(A p); @@ -319,8 +276,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); bool supportsCsharpSerializable(); diff --git a/java/test/src/main/java/test/Ice/optional/TestAMD.ice b/java/test/src/main/java/test/Ice/optional/TestAMD.ice index fe0bc857651..9bb375a2c3e 100644 --- a/java/test/src/main/java/test/Ice/optional/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/optional/TestAMD.ice @@ -197,110 +197,67 @@ interface Initial void opRequiredException(optional(1) int a, optional(2) string b) throws OptionalException; - ["java:optional"] optional(1) byte opByte(optional(2) byte p1, out optional(3) byte p3); - optional(1) byte opByteReq(optional(2) byte p1, out optional(3) byte p3); + optional(1) byte opByte(optional(2) byte p1, out optional(3) byte p3); - ["java:optional"] optional(1) bool opBool(optional(2) bool p1, out optional(3) bool p3); - optional(1) bool opBoolReq(optional(2) bool p1, out optional(3) bool p3); + optional(1) bool opBool(optional(2) bool p1, out optional(3) bool p3); - ["java:optional"] optional(1) short opShort(optional(2) short p1, out optional(3) short p3); - optional(1) short opShortReq(optional(2) short p1, out optional(3) short p3); + optional(1) short opShort(optional(2) short p1, out optional(3) short p3); - ["java:optional"] optional(1) int opInt(optional(2) int p1, out optional(3) int p3); - optional(1) int opIntReq(optional(2) int p1, out optional(3) int p3); + optional(1) int opInt(optional(2) int p1, out optional(3) int p3); - ["java:optional"] optional(3) long opLong(optional(1) long p1, out optional(2) long p3); - optional(3) long opLongReq(optional(1) long p1, out optional(2) long p3); + optional(3) long opLong(optional(1) long p1, out optional(2) long p3); - ["java:optional"] optional(1) float opFloat(optional(2) float p1, out optional(3) float p3); - optional(1) float opFloatReq(optional(2) float p1, out optional(3) float p3); + optional(1) float opFloat(optional(2) float p1, out optional(3) float p3); - ["java:optional"] optional(1) double opDouble(optional(2) double p1, out optional(3) double p3); - optional(1) double opDoubleReq(optional(2) double p1, out optional(3) double p3); + optional(1) double opDouble(optional(2) double p1, out optional(3) double p3); - ["java:optional"] optional(1) string opString(optional(2) string p1, out optional(3) string p3); - optional(1) string opStringReq(optional(2) string p1, out optional(3) string p3); + optional(1) string opString(optional(2) string p1, out optional(3) string p3); - ["java:optional"] optional(1) MyEnum opMyEnum(optional(2) MyEnum p1, out optional(3) MyEnum p3); - optional(1) MyEnum opMyEnumReq(optional(2) MyEnum p1, out optional(3) MyEnum p3); + optional(1) MyEnum opMyEnum(optional(2) MyEnum p1, out optional(3) MyEnum p3); - ["java:optional"] optional(1) SmallStruct opSmallStruct(optional(2) SmallStruct p1, out optional(3) SmallStruct p3); - optional(1) SmallStruct opSmallStructReq(optional(2) SmallStruct p1, out optional(3) SmallStruct p3); + optional(1) SmallStruct opSmallStruct(optional(2) SmallStruct p1, out optional(3) SmallStruct p3); - ["java:optional"] optional(1) FixedStruct opFixedStruct(optional(2) FixedStruct p1, out optional(3) FixedStruct p3); - optional(1) FixedStruct opFixedStructReq(optional(2) FixedStruct p1, out optional(3) FixedStruct p3); + optional(1) FixedStruct opFixedStruct(optional(2) FixedStruct p1, out optional(3) FixedStruct p3); - ["java:optional"] optional(1) VarStruct opVarStruct(optional(2) VarStruct p1, out optional(3) VarStruct p3); - optional(1) VarStruct opVarStructReq(optional(2) VarStruct p1, out optional(3) VarStruct p3); + optional(1) VarStruct opVarStruct(optional(2) VarStruct p1, out optional(3) VarStruct p3); - ["java:optional"] optional(1) MyInterface* opMyInterfaceProxy(optional(2) MyInterface* p1, - out optional(3) MyInterface* p3); - optional(1) MyInterface* opMyInterfaceProxyReq(optional(2) MyInterface* p1, out optional(3) MyInterface* p3); + optional(1) MyInterface* opMyInterfaceProxy(optional(2) MyInterface* p1, out optional(3) MyInterface* p3); OneOptional opOneOptional(OneOptional p1, out OneOptional p3); - ["java:optional"] optional(1) ByteSeq opByteSeq(optional(2) ByteSeq p1, out optional(3) ByteSeq p3); - optional(1) ByteSeq opByteSeqReq(optional(2) ByteSeq p1, out optional(3) ByteSeq p3); + optional(1) ByteSeq opByteSeq(optional(2) ByteSeq p1, out optional(3) ByteSeq p3); - ["java:optional"] optional(1) BoolSeq opBoolSeq(optional(2) BoolSeq p1, out optional(3) BoolSeq p3); - optional(1) BoolSeq opBoolSeqReq(optional(2) BoolSeq p1, out optional(3) BoolSeq p3); + optional(1) BoolSeq opBoolSeq(optional(2) BoolSeq p1, out optional(3) BoolSeq p3); - ["java:optional"] optional(1) ShortSeq opShortSeq(optional(2) ShortSeq p1, out optional(3) ShortSeq p3); - optional(1) ShortSeq opShortSeqReq(optional(2) ShortSeq p1, out optional(3) ShortSeq p3); + optional(1) ShortSeq opShortSeq(optional(2) ShortSeq p1, out optional(3) ShortSeq p3); - ["java:optional"] optional(1) IntSeq opIntSeq(optional(2) IntSeq p1, out optional(3) IntSeq p3); - optional(1) IntSeq opIntSeqReq(optional(2) IntSeq p1, out optional(3) IntSeq p3); + optional(1) IntSeq opIntSeq(optional(2) IntSeq p1, out optional(3) IntSeq p3); - ["java:optional"] optional(1) LongSeq opLongSeq(optional(2) LongSeq p1, out optional(3) LongSeq p3); - optional(1) LongSeq opLongSeqReq(optional(2) LongSeq p1, out optional(3) LongSeq p3); + optional(1) LongSeq opLongSeq(optional(2) LongSeq p1, out optional(3) LongSeq p3); - ["java:optional"] optional(1) FloatSeq opFloatSeq(optional(2) FloatSeq p1, out optional(3) FloatSeq p3); - optional(1) FloatSeq opFloatSeqReq(optional(2) FloatSeq p1, out optional(3) FloatSeq p3); + optional(1) FloatSeq opFloatSeq(optional(2) FloatSeq p1, out optional(3) FloatSeq p3); - ["java:optional"] optional(1) DoubleSeq opDoubleSeq(optional(2) DoubleSeq p1, out optional(3) DoubleSeq p3); - optional(1) DoubleSeq opDoubleSeqReq(optional(2) DoubleSeq p1, out optional(3) DoubleSeq p3); + optional(1) DoubleSeq opDoubleSeq(optional(2) DoubleSeq p1, out optional(3) DoubleSeq p3); - ["java:optional"] optional(1) StringSeq opStringSeq(optional(2) StringSeq p1, out optional(3) StringSeq p3); - optional(1) StringSeq opStringSeqReq(optional(2) StringSeq p1, out optional(3) StringSeq p3); + optional(1) StringSeq opStringSeq(optional(2) StringSeq p1, out optional(3) StringSeq p3); - ["java:optional"] optional(1) SmallStructSeq opSmallStructSeq(optional(2) SmallStructSeq p1, - out optional(3) SmallStructSeq p3); - optional(1) SmallStructSeq opSmallStructSeqReq(optional(2) SmallStructSeq p1, out optional(3) SmallStructSeq p3); + optional(1) SmallStructSeq opSmallStructSeq(optional(2) SmallStructSeq p1, out optional(3) SmallStructSeq p3); - ["java:optional"] optional(1) SmallStructList opSmallStructList(optional(2) SmallStructList p1, - out optional(3) SmallStructList p3); - optional(1) SmallStructList opSmallStructListReq(optional(2) SmallStructList p1, - out optional(3) SmallStructList p3); + optional(1) SmallStructList opSmallStructList(optional(2) SmallStructList p1, out optional(3) SmallStructList p3); - ["java:optional"] optional(1) FixedStructSeq opFixedStructSeq(optional(2) FixedStructSeq p1, - out optional(3) FixedStructSeq p3); - optional(1) FixedStructSeq opFixedStructSeqReq(optional(2) FixedStructSeq p1, out optional(3) FixedStructSeq p3); + optional(1) FixedStructSeq opFixedStructSeq(optional(2) FixedStructSeq p1, out optional(3) FixedStructSeq p3); - ["java:optional"] optional(1) FixedStructList opFixedStructList(optional(2) FixedStructList p1, - out optional(3) FixedStructList p3); - optional(1) FixedStructList opFixedStructListReq(optional(2) FixedStructList p1, - out optional(3) FixedStructList p3); + optional(1) FixedStructList opFixedStructList(optional(2) FixedStructList p1, out optional(3) FixedStructList p3); - ["java:optional"] optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1, - out optional(3) VarStructSeq p3); - optional(1) VarStructSeq opVarStructSeqReq(optional(2) VarStructSeq p1, out optional(3) VarStructSeq p3); + optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1, out optional(3) VarStructSeq p3); - ["java:optional"] optional(1) Serializable opSerializable(optional(2) Serializable p1, - out optional(3) Serializable p3); - optional(1) Serializable opSerializableReq(optional(2) Serializable p1, out optional(3) Serializable p3); + optional(1) Serializable opSerializable(optional(2) Serializable p1, out optional(3) Serializable p3); - ["java:optional"] optional(1) IntIntDict opIntIntDict(optional(2) IntIntDict p1, out optional(3) IntIntDict p3); - optional(1) IntIntDict opIntIntDictReq(optional(2) IntIntDict p1, out optional(3) IntIntDict p3); + optional(1) IntIntDict opIntIntDict(optional(2) IntIntDict p1, out optional(3) IntIntDict p3); - ["java:optional"] optional(1) StringIntDict opStringIntDict(optional(2) StringIntDict p1, - out optional(3) StringIntDict p3); - optional(1) StringIntDict opStringIntDictReq(optional(2) StringIntDict p1, out optional(3) StringIntDict p3); + optional(1) StringIntDict opStringIntDict(optional(2) StringIntDict p1, out optional(3) StringIntDict p3); - ["java:optional"] optional(1) IntOneOptionalDict opIntOneOptionalDict(optional(2) IntOneOptionalDict p1, - out optional(3) IntOneOptionalDict p3); - - optional(1) IntOneOptionalDict opIntOneOptionalDictReq(optional(2) IntOneOptionalDict p1, - out optional(3) IntOneOptionalDict p3); + optional(1) IntOneOptionalDict opIntOneOptionalDict(optional(2) IntOneOptionalDict p1, out optional(3) IntOneOptionalDict p3); void opClassAndUnknownOptional(A p); @@ -308,19 +265,17 @@ interface Initial void opVoid(); - ["marshaled-result", "java:optional"] optional(1) SmallStruct opMStruct1(); - ["marshaled-result", "java:optional"] optional(1) SmallStruct opMStruct2(optional(2) SmallStruct p1, - out optional(3)SmallStruct p2); - - ["marshaled-result", "java:optional"] optional(1) StringSeq opMSeq1(); - ["marshaled-result", "java:optional"] optional(1) StringSeq opMSeq2(optional(2) StringSeq p1, - out optional(3) StringSeq p2); + ["marshaled-result"] optional(1) SmallStruct opMStruct1(); + ["marshaled-result"] optional(1) SmallStruct opMStruct2(optional(2) SmallStruct p1, + out optional(3)SmallStruct p2); - ["marshaled-result", "java:optional"] optional(1) StringIntDict opMDict1(); - ["marshaled-result", "java:optional"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, - out optional(3) StringIntDict p2); + ["marshaled-result"] optional(1) StringSeq opMSeq1(); + ["marshaled-result"] optional(1) StringSeq opMSeq2(optional(2) StringSeq p1, + out optional(3) StringSeq p2); - bool supportsRequiredParams(); + ["marshaled-result"] optional(1) StringIntDict opMDict1(); + ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, + out optional(3) StringIntDict p2); bool supportsJavaSerializable(); diff --git a/js/test/Ice/optional/AMDInitialI.js b/js/test/Ice/optional/AMDInitialI.js index 281092af9fb..bd17370dc13 100644 --- a/js/test/Ice/optional/AMDInitialI.js +++ b/js/test/Ice/optional/AMDInitialI.js @@ -278,11 +278,6 @@ return [p1, p1]; } - supportsRequiredParams(current) - { - return false; - } - supportsJavaSerializable(current) { return false; diff --git a/js/test/Ice/optional/InitialI.js b/js/test/Ice/optional/InitialI.js index 440e284410d..384d7eb83fb 100644 --- a/js/test/Ice/optional/InitialI.js +++ b/js/test/Ice/optional/InitialI.js @@ -278,11 +278,6 @@ return [p1, p1]; } - supportsRequiredParams(current) - { - return false; - } - supportsJavaSerializable(current) { return false; diff --git a/js/test/Ice/optional/Test.ice b/js/test/Ice/optional/Test.ice index 9b07528a28d..3c6d0ebeaa7 100644 --- a/js/test/Ice/optional/Test.ice +++ b/js/test/Ice/optional/Test.ice @@ -276,8 +276,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); bool supportsCsharpSerializable(); diff --git a/js/test/typescript/Ice/optional/AMDInitialI.ts b/js/test/typescript/Ice/optional/AMDInitialI.ts index 105950904cd..15995e80eed 100644 --- a/js/test/typescript/Ice/optional/AMDInitialI.ts +++ b/js/test/typescript/Ice/optional/AMDInitialI.ts @@ -277,11 +277,6 @@ export class AMDInitialI extends Test.Initial return [p1, p1]; } - supportsRequiredParams(current:Ice.Current):boolean - { - return false; - } - supportsJavaSerializable(current:Ice.Current):boolean { return false; diff --git a/js/test/typescript/Ice/optional/InitialI.ts b/js/test/typescript/Ice/optional/InitialI.ts index 38fed51daa2..b44ff27d133 100644 --- a/js/test/typescript/Ice/optional/InitialI.ts +++ b/js/test/typescript/Ice/optional/InitialI.ts @@ -277,11 +277,6 @@ export class InitialI extends Test.Initial return [p1, p1]; } - supportsRequiredParams(current:Ice.Current):boolean - { - return false; - } - supportsJavaSerializable(current:Ice.Current):boolean { return false; diff --git a/js/test/typescript/Ice/optional/Test.ice b/js/test/typescript/Ice/optional/Test.ice index 50077ff46bd..36be749ea35 100644 --- a/js/test/typescript/Ice/optional/Test.ice +++ b/js/test/typescript/Ice/optional/Test.ice @@ -278,8 +278,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); bool supportsCsharpSerializable(); diff --git a/matlab/test/Ice/optional/Test.ice b/matlab/test/Ice/optional/Test.ice index a064f211d11..68e1f2520b9 100644 --- a/matlab/test/Ice/optional/Test.ice +++ b/matlab/test/Ice/optional/Test.ice @@ -284,8 +284,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); bool supportsCsharpSerializable(); diff --git a/php/test/Ice/optional/Test.ice b/php/test/Ice/optional/Test.ice index cea99611cac..c6741b30f24 100644 --- a/php/test/Ice/optional/Test.ice +++ b/php/test/Ice/optional/Test.ice @@ -274,8 +274,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); bool supportsCsharpSerializable(); diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py index 66a89b21bad..8edc359ac43 100755 --- a/python/test/Ice/optional/Server.py +++ b/python/test/Ice/optional/Server.py @@ -157,9 +157,6 @@ def opRequiredAfterOptional(self, p1, p2, p3, current): def opOptionalAfterRequired(self, p1, p2, p3, current): return (p1, p2, p3) - def supportsRequiredParams(self, current=None): - return False - def supportsJavaSerializable(self, current=None): return True diff --git a/python/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py index 4ac69883274..cad52987468 100755 --- a/python/test/Ice/optional/ServerAMD.py +++ b/python/test/Ice/optional/ServerAMD.py @@ -171,9 +171,6 @@ def opRequiredAfterOptional(self, p1, p2, p3, current): def opOptionalAfterRequired(self, p1, p2, p3, current): return Ice.Future.completed((p1, p2, p3)) - def supportsRequiredParams(self, current=None): - return Ice.Future.completed(False) - def supportsJavaSerializable(self, current=None): return Ice.Future.completed(True) diff --git a/python/test/Ice/optional/Test.ice b/python/test/Ice/optional/Test.ice index b4075e68709..b205594afa6 100644 --- a/python/test/Ice/optional/Test.ice +++ b/python/test/Ice/optional/Test.ice @@ -280,8 +280,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); bool supportsCsharpSerializable(); diff --git a/ruby/test/Ice/optional/Test.ice b/ruby/test/Ice/optional/Test.ice index 591bb4cccf0..bf29c62bdd0 100644 --- a/ruby/test/Ice/optional/Test.ice +++ b/ruby/test/Ice/optional/Test.ice @@ -276,8 +276,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); bool supportsCsharpSerializable(); diff --git a/swift/test/Ice/optional/Test.ice b/swift/test/Ice/optional/Test.ice index d8016c0c144..e8e0be090b0 100644 --- a/swift/test/Ice/optional/Test.ice +++ b/swift/test/Ice/optional/Test.ice @@ -283,8 +283,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); bool supportsCsharpSerializable(); diff --git a/swift/test/Ice/optional/TestAMD.ice b/swift/test/Ice/optional/TestAMD.ice index 73745e2edb8..65cda41dc08 100644 --- a/swift/test/Ice/optional/TestAMD.ice +++ b/swift/test/Ice/optional/TestAMD.ice @@ -279,8 +279,6 @@ interface Initial ["marshaled-result"] optional(1) StringIntDict opMDict2(optional(2) StringIntDict p1, out optional(3) StringIntDict p2); - bool supportsRequiredParams(); - bool supportsJavaSerializable(); bool supportsCsharpSerializable(); diff --git a/swift/test/Ice/optional/TestAMDI.swift b/swift/test/Ice/optional/TestAMDI.swift index 5e2e2ae9194..c4ff1ec73e6 100644 --- a/swift/test/Ice/optional/TestAMDI.swift +++ b/swift/test/Ice/optional/TestAMDI.swift @@ -290,10 +290,6 @@ class InitialI: Initial { return Promise.value((p1, p1)) } - func supportsRequiredParamsAsync(current _: Current) -> Promise { - return Promise.value(false) - } - func supportsJavaSerializableAsync(current _: Current) -> Promise { return Promise.value(false) } diff --git a/swift/test/Ice/optional/TestI.swift b/swift/test/Ice/optional/TestI.swift index 5a8efdce795..4956417f952 100644 --- a/swift/test/Ice/optional/TestI.swift +++ b/swift/test/Ice/optional/TestI.swift @@ -251,10 +251,6 @@ class InitialI: Initial { func opVoid(current _: Ice.Current) throws {} - func supportsRequiredParams(current _: Ice.Current) throws -> Bool { - return false - } - func supportsJavaSerializable(current _: Ice.Current) throws -> Bool { return false }