summaryrefslogtreecommitdiff
path: root/java/test
diff options
context:
space:
mode:
Diffstat (limited to 'java/test')
-rw-r--r--java/test/Ice/optional/AMDInitialI.java428
-rw-r--r--java/test/Ice/optional/AMDServer.java39
-rw-r--r--java/test/Ice/optional/InitialI.java244
-rw-r--r--java/test/Ice/optional/TestAMD.ice276
-rwxr-xr-xjava/test/Ice/optional/run.py2
5 files changed, 865 insertions, 124 deletions
diff --git a/java/test/Ice/optional/AMDInitialI.java b/java/test/Ice/optional/AMDInitialI.java
new file mode 100644
index 00000000000..732b0152b46
--- /dev/null
+++ b/java/test/Ice/optional/AMDInitialI.java
@@ -0,0 +1,428 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package test.Ice.optional;
+
+import test.Ice.optional.AMD.Test.*;
+
+public final class AMDInitialI extends Initial
+{
+ public void
+ shutdown_async(AMD_Initial_shutdown cb, Ice.Current current)
+ {
+ current.adapter.getCommunicator().shutdown();
+ cb.ice_response();
+ }
+
+ public void
+ pingPong_async(AMD_Initial_pingPong cb, Ice.Object obj, Ice.Current current)
+ {
+ cb.ice_response(obj);
+ }
+
+ public void
+ opOptionalException_async(AMD_Initial_opOptionalException cb, Ice.IntOptional a, Ice.Optional<String> b,
+ Ice.Optional<OneOptional> o, Ice.Current current)
+ throws OptionalException
+ {
+ OptionalException ex = new OptionalException();
+ if(a.isSet())
+ {
+ ex.setA(a.get());
+ }
+ else
+ {
+ ex.clearA(); // The member "a" has a default value.
+ }
+ if(b.isSet())
+ {
+ ex.setB(b.get());
+ }
+ if(o.isSet())
+ {
+ ex.setO(o.get());
+ }
+ cb.ice_exception(ex);
+ }
+
+ public void
+ opByte_async(AMD_Initial_opByte cb, Ice.ByteOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opByteOpt_async(AMD_Initial_opByteOpt cb, Ice.ByteOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opBool_async(AMD_Initial_opBool cb, Ice.BooleanOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opBoolOpt_async(AMD_Initial_opBoolOpt cb, Ice.BooleanOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opShort_async(AMD_Initial_opShort cb, Ice.ShortOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opShortOpt_async(AMD_Initial_opShortOpt cb, Ice.ShortOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opInt_async(AMD_Initial_opInt cb, Ice.IntOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opIntOpt_async(AMD_Initial_opIntOpt cb, Ice.IntOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opLong_async(AMD_Initial_opLong cb, Ice.LongOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opLongOpt_async(AMD_Initial_opLongOpt cb, Ice.LongOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opFloat_async(AMD_Initial_opFloat cb, Ice.FloatOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opFloatOpt_async(AMD_Initial_opFloatOpt cb, Ice.FloatOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opDouble_async(AMD_Initial_opDouble cb, Ice.DoubleOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opDoubleOpt_async(AMD_Initial_opDoubleOpt cb, Ice.DoubleOptional p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opString_async(AMD_Initial_opString cb, Ice.Optional<String> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opStringOpt_async(AMD_Initial_opStringOpt cb, Ice.Optional<String> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opMyEnum_async(AMD_Initial_opMyEnum cb, Ice.Optional<MyEnum> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opMyEnumOpt_async(AMD_Initial_opMyEnumOpt cb, Ice.Optional<MyEnum> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opSmallStruct_async(AMD_Initial_opSmallStruct cb, Ice.Optional<SmallStruct> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opSmallStructOpt_async(AMD_Initial_opSmallStructOpt cb, Ice.Optional<SmallStruct> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opFixedStruct_async(AMD_Initial_opFixedStruct cb, Ice.Optional<FixedStruct> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opFixedStructOpt_async(AMD_Initial_opFixedStructOpt cb, Ice.Optional<FixedStruct> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opVarStruct_async(AMD_Initial_opVarStruct cb, Ice.Optional<VarStruct> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opVarStructOpt_async(AMD_Initial_opVarStructOpt cb, Ice.Optional<VarStruct> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opOneOptional_async(AMD_Initial_opOneOptional cb, Ice.Optional<OneOptional> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opOneOptionalOpt_async(AMD_Initial_opOneOptionalOpt cb, Ice.Optional<OneOptional> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opOneOptionalProxy_async(AMD_Initial_opOneOptionalProxy cb, Ice.Optional<OneOptionalPrx> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opOneOptionalProxyOpt_async(AMD_Initial_opOneOptionalProxyOpt cb, Ice.Optional<OneOptionalPrx> p1,
+ Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opByteSeq_async(AMD_Initial_opByteSeq cb, Ice.Optional<byte[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opByteSeqOpt_async(AMD_Initial_opByteSeqOpt cb, Ice.Optional<byte[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opBoolSeq_async(AMD_Initial_opBoolSeq cb, Ice.Optional<boolean[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opBoolSeqOpt_async(AMD_Initial_opBoolSeqOpt cb, Ice.Optional<boolean[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opShortSeq_async(AMD_Initial_opShortSeq cb, Ice.Optional<short[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opShortSeqOpt_async(AMD_Initial_opShortSeqOpt cb, Ice.Optional<short[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opIntSeq_async(AMD_Initial_opIntSeq cb, Ice.Optional<int[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opIntSeqOpt_async(AMD_Initial_opIntSeqOpt cb, Ice.Optional<int[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opLongSeq_async(AMD_Initial_opLongSeq cb, Ice.Optional<long[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opLongSeqOpt_async(AMD_Initial_opLongSeqOpt cb, Ice.Optional<long[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opFloatSeq_async(AMD_Initial_opFloatSeq cb, Ice.Optional<float[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opFloatSeqOpt_async(AMD_Initial_opFloatSeqOpt cb, Ice.Optional<float[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opDoubleSeq_async(AMD_Initial_opDoubleSeq cb, Ice.Optional<double[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opDoubleSeqOpt_async(AMD_Initial_opDoubleSeqOpt cb, Ice.Optional<double[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opStringSeq_async(AMD_Initial_opStringSeq cb, Ice.Optional<String[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opStringSeqOpt_async(AMD_Initial_opStringSeqOpt cb, Ice.Optional<String[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opSmallStructSeq_async(AMD_Initial_opSmallStructSeq cb, Ice.Optional<SmallStruct[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opSmallStructSeqOpt_async(AMD_Initial_opSmallStructSeqOpt cb, Ice.Optional<SmallStruct[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opSmallStructList_async(AMD_Initial_opSmallStructList cb, Ice.Optional<java.util.List<SmallStruct>> p1,
+ Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opSmallStructListOpt_async(AMD_Initial_opSmallStructListOpt cb, Ice.Optional<java.util.List<SmallStruct>> p1,
+ Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opFixedStructSeq_async(AMD_Initial_opFixedStructSeq cb, Ice.Optional<FixedStruct[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opFixedStructSeqOpt_async(AMD_Initial_opFixedStructSeqOpt cb, Ice.Optional<FixedStruct[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opFixedStructList_async(AMD_Initial_opFixedStructList cb, Ice.Optional<java.util.List<FixedStruct>> p1,
+ Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opFixedStructListOpt_async(AMD_Initial_opFixedStructListOpt cb, Ice.Optional<java.util.List<FixedStruct>> p1,
+ Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opVarStructSeq_async(AMD_Initial_opVarStructSeq cb, Ice.Optional<VarStruct[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opVarStructSeqOpt_async(AMD_Initial_opVarStructSeqOpt cb, Ice.Optional<VarStruct[]> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opSerializable_async(AMD_Initial_opSerializable cb, Ice.Optional<SerializableClass> p1, Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opSerializableOpt_async(AMD_Initial_opSerializableOpt cb, Ice.Optional<SerializableClass> p1, Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opIntIntDict_async(AMD_Initial_opIntIntDict cb, Ice.Optional<java.util.Map<Integer, Integer>> p1,
+ Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opIntIntDictOpt_async(AMD_Initial_opIntIntDictOpt cb, Ice.Optional<java.util.Map<Integer, Integer>> p1,
+ Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opStringIntDict_async(AMD_Initial_opStringIntDict cb, Ice.Optional<java.util.Map<String, Integer>> p1,
+ Ice.Current current)
+ {
+ cb.ice_response(p1.get(), p1.get());
+ }
+
+ public void
+ opStringIntDictOpt_async(AMD_Initial_opStringIntDictOpt cb, Ice.Optional<java.util.Map<String, Integer>> p1,
+ Ice.Current current)
+ {
+ cb.ice_response(p1, p1);
+ }
+
+ public void
+ opClassAndUnknownOptional_async(AMD_Initial_opClassAndUnknownOptional cb, A p, Ice.Current current)
+ {
+ cb.ice_response();
+ }
+}
diff --git a/java/test/Ice/optional/AMDServer.java b/java/test/Ice/optional/AMDServer.java
new file mode 100644
index 00000000000..df5550d0544
--- /dev/null
+++ b/java/test/Ice/optional/AMDServer.java
@@ -0,0 +1,39 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package test.Ice.optional;
+
+public class AMDServer extends test.Util.Application
+{
+ public int run(String[] args)
+ {
+ communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
+ Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+ adapter.add(new AMDInitialI(), communicator().stringToIdentity("initial"));
+ adapter.activate();
+ return WAIT;
+ }
+
+ protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+ {
+ Ice.InitializationData initData = new Ice.InitializationData();
+ initData.properties = Ice.Util.createProperties(argsH);
+ initData.properties.setProperty("Ice.Package.Test", "test.Ice.optional.AMD");
+ return initData;
+ }
+
+ public static void main(String[] args)
+ {
+ AMDServer c = new AMDServer();
+ int status = c.main("Server", args);
+
+ System.gc();
+ System.exit(status);
+ }
+}
diff --git a/java/test/Ice/optional/InitialI.java b/java/test/Ice/optional/InitialI.java
index 31df8707394..2acba8b6158 100644
--- a/java/test/Ice/optional/InitialI.java
+++ b/java/test/Ice/optional/InitialI.java
@@ -50,11 +50,11 @@ public final class InitialI extends Initial
throw ex;
}
- public Ice.ByteOptional
- opByte(Ice.ByteOptional p1, Ice.ByteOptional p3, Ice.Current current)
+ public byte
+ opByte(Ice.ByteOptional p1, Ice.ByteHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.ByteOptional
@@ -64,11 +64,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.BooleanOptional
- opBool(Ice.BooleanOptional p1, Ice.BooleanOptional p3, Ice.Current current)
+ public boolean
+ opBool(Ice.BooleanOptional p1, Ice.BooleanHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.BooleanOptional
@@ -78,11 +78,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.ShortOptional
- opShort(Ice.ShortOptional p1, Ice.ShortOptional p3, Ice.Current current)
+ public short
+ opShort(Ice.ShortOptional p1, Ice.ShortHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.ShortOptional
@@ -92,11 +92,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.IntOptional
- opInt(Ice.IntOptional p1, Ice.IntOptional p3, Ice.Current current)
+ public int
+ opInt(Ice.IntOptional p1, Ice.IntHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.IntOptional
@@ -106,11 +106,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.LongOptional
- opLong(Ice.LongOptional p1, Ice.LongOptional p3, Ice.Current current)
+ public long
+ opLong(Ice.LongOptional p1, Ice.LongHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.LongOptional
@@ -120,11 +120,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.FloatOptional
- opFloat(Ice.FloatOptional p1, Ice.FloatOptional p3, Ice.Current current)
+ public float
+ opFloat(Ice.FloatOptional p1, Ice.FloatHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.FloatOptional
@@ -134,11 +134,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.DoubleOptional
- opDouble(Ice.DoubleOptional p1, Ice.DoubleOptional p3, Ice.Current current)
+ public double
+ opDouble(Ice.DoubleOptional p1, Ice.DoubleHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.DoubleOptional
@@ -148,11 +148,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<String>
- opString(Ice.Optional<String> p1, Ice.Optional<String> p3, Ice.Current current)
+ public String
+ opString(Ice.Optional<String> p1, Ice.StringHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<String>
@@ -162,11 +162,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<MyEnum>
- opMyEnum(Ice.Optional<MyEnum> p1, Ice.Optional<MyEnum> p3, Ice.Current current)
+ public MyEnum
+ opMyEnum(Ice.Optional<MyEnum> p1, MyEnumHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<MyEnum>
@@ -176,11 +176,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<SmallStruct>
- opSmallStruct(Ice.Optional<SmallStruct> p1, Ice.Optional<SmallStruct> p3, Ice.Current current)
+ public SmallStruct
+ opSmallStruct(Ice.Optional<SmallStruct> p1, SmallStructHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<SmallStruct>
@@ -190,11 +190,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<FixedStruct>
- opFixedStruct(Ice.Optional<FixedStruct> p1, Ice.Optional<FixedStruct> p3, Ice.Current current)
+ public FixedStruct
+ opFixedStruct(Ice.Optional<FixedStruct> p1, FixedStructHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<FixedStruct>
@@ -204,11 +204,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<VarStruct>
- opVarStruct(Ice.Optional<VarStruct> p1, Ice.Optional<VarStruct> p3, Ice.Current current)
+ public VarStruct
+ opVarStruct(Ice.Optional<VarStruct> p1, VarStructHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<VarStruct>
@@ -218,11 +218,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<OneOptional>
- opOneOptional(Ice.Optional<OneOptional> p1, Ice.Optional<OneOptional> p3, Ice.Current current)
+ public OneOptional
+ opOneOptional(Ice.Optional<OneOptional> p1, OneOptionalHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<OneOptional>
@@ -232,11 +232,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<OneOptionalPrx>
- opOneOptionalProxy(Ice.Optional<OneOptionalPrx> p1, Ice.Optional<OneOptionalPrx> p3, Ice.Current current)
+ public OneOptionalPrx
+ opOneOptionalProxy(Ice.Optional<OneOptionalPrx> p1, OneOptionalPrxHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<OneOptionalPrx>
@@ -246,11 +246,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<byte[]>
- opByteSeq(Ice.Optional<byte[]> p1, Ice.Optional<byte[]> p3, Ice.Current current)
+ public byte[]
+ opByteSeq(Ice.Optional<byte[]> p1, ByteSeqHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<byte[]>
@@ -260,11 +260,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<boolean[]>
- opBoolSeq(Ice.Optional<boolean[]> p1, Ice.Optional<boolean[]> p3, Ice.Current current)
+ public boolean[]
+ opBoolSeq(Ice.Optional<boolean[]> p1, BoolSeqHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<boolean[]>
@@ -274,11 +274,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<short[]>
- opShortSeq(Ice.Optional<short[]> p1, Ice.Optional<short[]> p3, Ice.Current current)
+ public short[]
+ opShortSeq(Ice.Optional<short[]> p1, ShortSeqHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<short[]>
@@ -288,11 +288,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<int[]>
- opIntSeq(Ice.Optional<int[]> p1, Ice.Optional<int[]> p3, Ice.Current current)
+ public int[]
+ opIntSeq(Ice.Optional<int[]> p1, IntSeqHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<int[]>
@@ -302,11 +302,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<long[]>
- opLongSeq(Ice.Optional<long[]> p1, Ice.Optional<long[]> p3, Ice.Current current)
+ public long[]
+ opLongSeq(Ice.Optional<long[]> p1, LongSeqHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<long[]>
@@ -316,11 +316,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<float[]>
- opFloatSeq(Ice.Optional<float[]> p1, Ice.Optional<float[]> p3, Ice.Current current)
+ public float[]
+ opFloatSeq(Ice.Optional<float[]> p1, FloatSeqHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<float[]>
@@ -330,11 +330,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<double[]>
- opDoubleSeq(Ice.Optional<double[]> p1, Ice.Optional<double[]> p3, Ice.Current current)
+ public double[]
+ opDoubleSeq(Ice.Optional<double[]> p1, DoubleSeqHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<double[]>
@@ -344,11 +344,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<String[]>
- opStringSeq(Ice.Optional<String[]> p1, Ice.Optional<String[]> p3, Ice.Current current)
+ public String[]
+ opStringSeq(Ice.Optional<String[]> p1, StringSeqHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<String[]>
@@ -358,11 +358,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<SmallStruct[]>
- opSmallStructSeq(Ice.Optional<SmallStruct[]> p1, Ice.Optional<SmallStruct[]> p3, Ice.Current current)
+ public SmallStruct[]
+ opSmallStructSeq(Ice.Optional<SmallStruct[]> p1, SmallStructSeqHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<SmallStruct[]>
@@ -372,12 +372,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<java.util.List<SmallStruct>>
- opSmallStructList(Ice.Optional<java.util.List<SmallStruct>> p1,
- Ice.Optional<java.util.List<SmallStruct>> p3, Ice.Current current)
+ public java.util.List<SmallStruct>
+ opSmallStructList(Ice.Optional<java.util.List<SmallStruct>> p1, SmallStructListHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<java.util.List<SmallStruct>>
@@ -388,11 +387,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<FixedStruct[]>
- opFixedStructSeq(Ice.Optional<FixedStruct[]> p1, Ice.Optional<FixedStruct[]> p3, Ice.Current current)
+ public FixedStruct[]
+ opFixedStructSeq(Ice.Optional<FixedStruct[]> p1, FixedStructSeqHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<FixedStruct[]>
@@ -402,12 +401,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<java.util.List<FixedStruct>>
- opFixedStructList(Ice.Optional<java.util.List<FixedStruct>> p1,
- Ice.Optional<java.util.List<FixedStruct>> p3, Ice.Current current)
+ public java.util.List<FixedStruct>
+ opFixedStructList(Ice.Optional<java.util.List<FixedStruct>> p1, FixedStructListHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<java.util.List<FixedStruct>>
@@ -418,11 +416,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<VarStruct[]>
- opVarStructSeq(Ice.Optional<VarStruct[]> p1, Ice.Optional<VarStruct[]> p3, Ice.Current current)
+ public VarStruct[]
+ opVarStructSeq(Ice.Optional<VarStruct[]> p1, VarStructSeqHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<VarStruct[]>
@@ -432,11 +430,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<SerializableClass>
- opSerializable(Ice.Optional<SerializableClass> p1, Ice.Optional<SerializableClass> p3, Ice.Current current)
+ public SerializableClass
+ opSerializable(Ice.Optional<SerializableClass> p1, Ice.Holder<SerializableClass> p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<SerializableClass>
@@ -446,12 +444,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<java.util.Map<Integer, Integer>>
- opIntIntDict(Ice.Optional<java.util.Map<Integer, Integer>> p1,
- Ice.Optional<java.util.Map<Integer, Integer>> p3, Ice.Current current)
+ public java.util.Map<Integer, Integer>
+ opIntIntDict(Ice.Optional<java.util.Map<Integer, Integer>> p1, IntIntDictHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<java.util.Map<Integer, Integer>>
@@ -462,12 +459,11 @@ public final class InitialI extends Initial
return p1;
}
- public Ice.Optional<java.util.Map<String, Integer>>
- opStringIntDict(Ice.Optional<java.util.Map<String, Integer>> p1,
- Ice.Optional<java.util.Map<String, Integer>> p3, Ice.Current current)
+ public java.util.Map<String, Integer>
+ opStringIntDict(Ice.Optional<java.util.Map<String, Integer>> p1, StringIntDictHolder p3, Ice.Current current)
{
- p3.set(p1);
- return p1;
+ p3.value = p1.get();
+ return p1.get();
}
public Ice.Optional<java.util.Map<String, Integer>>
diff --git a/java/test/Ice/optional/TestAMD.ice b/java/test/Ice/optional/TestAMD.ice
new file mode 100644
index 00000000000..42209e9ee1e
--- /dev/null
+++ b/java/test/Ice/optional/TestAMD.ice
@@ -0,0 +1,276 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#pragma once
+
+[["java:package:test.Ice.optional.AMD"]]
+module Test
+{
+
+class OneOptional
+{
+ optional(1) int a;
+};
+
+enum MyEnum
+{
+ MyEnumMember
+};
+
+struct SmallStruct
+{
+ byte m;
+};
+
+struct FixedStruct
+{
+ int m;
+};
+
+struct VarStruct
+{
+ string m;
+};
+
+struct ClassVarStruct
+{
+ int a;
+};
+
+sequence<byte> ByteSeq;
+sequence<bool> BoolSeq;
+sequence<short> ShortSeq;
+sequence<int> IntSeq;
+sequence<long> LongSeq;
+sequence<float> FloatSeq;
+sequence<double> DoubleSeq;
+sequence<string> StringSeq;
+sequence<MyEnum> MyEnumSeq;
+sequence<SmallStruct> SmallStructSeq;
+["java:type:java.util.ArrayList<SmallStruct>"] sequence<SmallStruct> SmallStructList;
+sequence<FixedStruct> FixedStructSeq;
+["java:type:java.util.ArrayList<FixedStruct>"] sequence<FixedStruct> FixedStructList;
+sequence<VarStruct> VarStructSeq;
+sequence<OneOptional> OneOptionalSeq;
+sequence<OneOptional*> OneOptionalPrxSeq;
+
+["java:serializable:test.Ice.optional.SerializableClass"] sequence<byte> Serializable;
+
+dictionary<int, int> IntIntDict;
+dictionary<string, int> StringIntDict;
+dictionary<int, MyEnum> IntEnumDict;
+dictionary<int, FixedStruct> IntFixedStructDict;
+dictionary<int, VarStruct> IntVarStructDict;
+dictionary<int, OneOptional> IntOneOptionalDict;
+dictionary<int, OneOptional*> IntOneOptionalPrxDict;
+
+class MultiOptional
+{
+ optional(1) byte a;
+ optional(2) bool b;
+ optional(3) short c;
+ optional(4) int d;
+ optional(5) long e;
+ optional(6) float f;
+ optional(7) double g;
+ optional(8) string h;
+ optional(9) MyEnum i;
+ optional(10) MultiOptional* j;
+ optional(11) MultiOptional k;
+ optional(12) ByteSeq bs;
+ optional(13) StringSeq ss;
+ optional(14) IntIntDict iid;
+ optional(15) StringIntDict sid;
+ optional(16) FixedStruct fs;
+ optional(17) VarStruct vs;
+
+ optional(18) ShortSeq shs;
+ optional(19) MyEnumSeq es;
+ optional(20) FixedStructSeq fss;
+ optional(21) VarStructSeq vss;
+ optional(22) OneOptionalSeq oos;
+ optional(23) OneOptionalPrxSeq oops;
+
+ optional(24) IntEnumDict ied;
+ optional(25) IntFixedStructDict ifsd;
+ optional(26) IntVarStructDict ivsd;
+ optional(27) IntOneOptionalDict iood;
+ optional(28) IntOneOptionalPrxDict ioopd;
+
+ optional(29) BoolSeq bos;
+};
+
+class A
+{
+ int requiredA;
+ optional(1) int ma;
+ optional(50) int mb;
+ optional(500) int mc;
+};
+
+["preserve-slice"]
+class B extends A
+{
+ int requiredB;
+ optional(10) int md;
+};
+
+class C extends B
+{
+ string ss;
+ optional(890) string ms;
+};
+
+class WD
+{
+ optional(1) int a = 5;
+ optional(2) string s = "test";
+};
+
+exception OptionalException
+{
+ optional(1) int a = 5;
+ optional(2) string b;
+ optional(50) OneOptional o;
+};
+
+exception DerivedException extends OptionalException
+{
+ optional(600) string ss = "test";
+ optional(601) OneOptional o2;
+};
+
+exception RequiredException extends OptionalException
+{
+ string ss = "test";
+ OneOptional o2;
+};
+
+class OptionalWithCustom
+{
+ ["java:type:java.util.ArrayList<Byte>"] optional(1) ByteSeq bs;
+ optional(2) ClassVarStruct s;
+};
+
+["ami", "amd"]
+class Initial
+{
+ void shutdown();
+
+ Object pingPong(Object o);
+
+ ["java:optional"]
+ void opOptionalException(optional(1) int a, optional(2) string b, optional(3) OneOptional o)
+ throws OptionalException;
+
+ optional(1) byte opByte(optional(2) byte p1, out optional(3) byte p3);
+ ["java:optional"] optional(1) byte opByteOpt(optional(2) byte p1, out optional(3) byte p3);
+
+ optional(1) bool opBool(optional(2) bool p1, out optional(3) bool p3);
+ ["java:optional"] optional(1) bool opBoolOpt(optional(2) bool p1, out optional(3) bool p3);
+
+ optional(1) short opShort(optional(2) short p1, out optional(3) short p3);
+ ["java:optional"] optional(1) short opShortOpt(optional(2) short p1, out optional(3) short p3);
+
+ optional(1) int opInt(optional(2) int p1, out optional(3) int p3);
+ ["java:optional"] optional(1) int opIntOpt(optional(2) int p1, out optional(3) int p3);
+
+ optional(1) long opLong(optional(2) long p1, out optional(3) long p3);
+ ["java:optional"] optional(1) long opLongOpt(optional(2) long p1, out optional(3) long p3);
+
+ optional(1) float opFloat(optional(2) float p1, out optional(3) float p3);
+ ["java:optional"] optional(1) float opFloatOpt(optional(2) float p1, out optional(3) float p3);
+
+ optional(1) double opDouble(optional(2) double p1, out optional(3) double p3);
+ ["java:optional"] optional(1) double opDoubleOpt(optional(2) double p1, out optional(3) double p3);
+
+ optional(1) string opString(optional(2) string p1, out optional(3) string p3);
+ ["java:optional"] optional(1) string opStringOpt(optional(2) string p1, out optional(3) string p3);
+
+ optional(1) MyEnum opMyEnum(optional(2) MyEnum p1, out optional(3) MyEnum p3);
+ ["java:optional"] optional(1) MyEnum opMyEnumOpt(optional(2) MyEnum p1, out optional(3) MyEnum p3);
+
+ optional(1) SmallStruct opSmallStruct(optional(2) SmallStruct p1, out optional(3) SmallStruct p3);
+ ["java:optional"] optional(1) SmallStruct opSmallStructOpt(optional(2) SmallStruct p1,
+ out optional(3) SmallStruct p3);
+
+ optional(1) FixedStruct opFixedStruct(optional(2) FixedStruct p1, out optional(3) FixedStruct p3);
+ ["java:optional"] optional(1) FixedStruct opFixedStructOpt(optional(2) FixedStruct p1,
+ out optional(3) FixedStruct p3);
+
+ optional(1) VarStruct opVarStruct(optional(2) VarStruct p1, out optional(3) VarStruct p3);
+ ["java:optional"] optional(1) VarStruct opVarStructOpt(optional(2) VarStruct p1, out optional(3) VarStruct p3);
+
+ optional(1) OneOptional opOneOptional(optional(2) OneOptional p1, out optional(3) OneOptional p3);
+ ["java:optional"] optional(1) OneOptional opOneOptionalOpt(optional(2) OneOptional p1,
+ out optional(3) OneOptional p3);
+
+ optional(1) OneOptional* opOneOptionalProxy(optional(2) OneOptional* p1, out optional(3) OneOptional* p3);
+ ["java:optional"] optional(1) OneOptional* opOneOptionalProxyOpt(optional(2) OneOptional* p1,
+ out optional(3) OneOptional* p3);
+
+ optional(1) ByteSeq opByteSeq(optional(2) ByteSeq p1, out optional(3) ByteSeq p3);
+ ["java:optional"] optional(1) ByteSeq opByteSeqOpt(optional(2) ByteSeq p1, out optional(3) ByteSeq p3);
+
+ optional(1) BoolSeq opBoolSeq(optional(2) BoolSeq p1, out optional(3) BoolSeq p3);
+ ["java:optional"] optional(1) BoolSeq opBoolSeqOpt(optional(2) BoolSeq p1, out optional(3) BoolSeq p3);
+
+ optional(1) ShortSeq opShortSeq(optional(2) ShortSeq p1, out optional(3) ShortSeq p3);
+ ["java:optional"] optional(1) ShortSeq opShortSeqOpt(optional(2) ShortSeq p1, out optional(3) ShortSeq p3);
+
+ optional(1) IntSeq opIntSeq(optional(2) IntSeq p1, out optional(3) IntSeq p3);
+ ["java:optional"] optional(1) IntSeq opIntSeqOpt(optional(2) IntSeq p1, out optional(3) IntSeq p3);
+
+ optional(1) LongSeq opLongSeq(optional(2) LongSeq p1, out optional(3) LongSeq p3);
+ ["java:optional"] optional(1) LongSeq opLongSeqOpt(optional(2) LongSeq p1, out optional(3) LongSeq p3);
+
+ optional(1) FloatSeq opFloatSeq(optional(2) FloatSeq p1, out optional(3) FloatSeq p3);
+ ["java:optional"] optional(1) FloatSeq opFloatSeqOpt(optional(2) FloatSeq p1, out optional(3) FloatSeq p3);
+
+ optional(1) DoubleSeq opDoubleSeq(optional(2) DoubleSeq p1, out optional(3) DoubleSeq p3);
+ ["java:optional"] optional(1) DoubleSeq opDoubleSeqOpt(optional(2) DoubleSeq p1, out optional(3) DoubleSeq p3);
+
+ optional(1) StringSeq opStringSeq(optional(2) StringSeq p1, out optional(3) StringSeq p3);
+ ["java:optional"] optional(1) StringSeq opStringSeqOpt(optional(2) StringSeq p1, out optional(3) StringSeq p3);
+
+ optional(1) SmallStructSeq opSmallStructSeq(optional(2) SmallStructSeq p1, out optional(3) SmallStructSeq p3);
+ ["java:optional"] optional(1) SmallStructSeq opSmallStructSeqOpt(optional(2) SmallStructSeq p1,
+ out optional(3) SmallStructSeq p3);
+
+ optional(1) SmallStructList opSmallStructList(optional(2) SmallStructList p1, out optional(3) SmallStructList p3);
+ ["java:optional"] optional(1) SmallStructList opSmallStructListOpt(optional(2) SmallStructList p1,
+ out optional(3) SmallStructList p3);
+
+ optional(1) FixedStructSeq opFixedStructSeq(optional(2) FixedStructSeq p1, out optional(3) FixedStructSeq p3);
+ ["java:optional"] optional(1) FixedStructSeq opFixedStructSeqOpt(optional(2) FixedStructSeq p1,
+ out optional(3) FixedStructSeq p3);
+
+ optional(1) FixedStructList opFixedStructList(optional(2) FixedStructList p1, out optional(3) FixedStructList p3);
+ ["java:optional"] optional(1) FixedStructList opFixedStructListOpt(optional(2) FixedStructList p1,
+ out optional(3) FixedStructList p3);
+
+ optional(1) VarStructSeq opVarStructSeq(optional(2) VarStructSeq p1, out optional(3) VarStructSeq p3);
+ ["java:optional"] optional(1) VarStructSeq opVarStructSeqOpt(optional(2) VarStructSeq p1,
+ out optional(3) VarStructSeq p3);
+
+ optional(1) Serializable opSerializable(optional(2) Serializable p1, out optional(3) Serializable p3);
+ ["java:optional"] optional(1) Serializable opSerializableOpt(optional(2) Serializable p1,
+ out optional(3) Serializable p3);
+
+ optional(1) IntIntDict opIntIntDict(optional(2) IntIntDict p1, out optional(3) IntIntDict p3);
+ ["java:optional"] optional(1) IntIntDict opIntIntDictOpt(optional(2) IntIntDict p1, out optional(3) IntIntDict p3);
+
+ optional(1) StringIntDict opStringIntDict(optional(2) StringIntDict p1, out optional(3) StringIntDict p3);
+ ["java:optional"] optional(1) StringIntDict opStringIntDictOpt(optional(2) StringIntDict p1,
+ out optional(3) StringIntDict p3);
+
+ void opClassAndUnknownOptional(A p);
+};
+
+};
diff --git a/java/test/Ice/optional/run.py b/java/test/Ice/optional/run.py
index 6ab39a07d80..1faa524d762 100755
--- a/java/test/Ice/optional/run.py
+++ b/java/test/Ice/optional/run.py
@@ -24,3 +24,5 @@ print("Running test with compact (default) format.")
TestUtil.clientServerTest()
print("Running test with sliced format.")
TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", additionalServerOptions="--Ice.Default.SlicedFormat")
+print("Running test with AMD server.")
+TestUtil.clientServerTest(server="test.Ice.optional.AMDServer")
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 00:02:32 +0000