more Java changes & tests

1 files changed, 120 insertions, 124 deletions

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>>