Fix (ICE-7562) - Eliminate class-with-operation deprecated warnings

30 files changed, 105 insertions, 146 deletions

diff --git a/java-compat/test/src/main/java/test/Ice/checksum/Types.ice b/java-compat/test/src/main/java/test/Ice/checksum/Types.ice
index 89c9eee01d3..95f5afc7728 100644
--- a/java-compat/test/src/main/java/test/Ice/checksum/Types.ice
+++ b/java-compat/test/src/main/java/test/Ice/checksum/Types.ice
@@ -379,7 +379,7 @@ exception OptionalEx4
 //
 // TEST: Same
 //
-class BaseClass1
+interface BaseInterface1
 {
     void baseOp1();
     void baseOp2(int i, out string s) throws Exception1;
@@ -388,7 +388,7 @@ class BaseClass1
 //
 // TEST: Change return type
 //
-class BaseClass2
+interface BaseInterface2
 {
     void baseOp();
     void baseOp2(int i, out string s) throws Exception1;
@@ -397,7 +397,7 @@ class BaseClass2
 //
 // TEST: Add parameter
 //
-class BaseClass3
+interface BaseInterface3
 {
     void baseOp();
     void baseOp2(int i, out string s) throws Exception1;
@@ -406,7 +406,7 @@ class BaseClass3
 //
 // TEST: Add exception
 //
-class BaseClass4
+interface BaseInterface4
 {
     void baseOp();
     void baseOp2(int i, out string s) throws Exception1;
@@ -415,7 +415,7 @@ class BaseClass4
 //
 // TEST: Change out parameter to in parameter
 //
-class BaseClass5
+interface BaseInterface5
 {
     void baseOp();
     void baseOp2(int i, out string s) throws Exception1;
@@ -424,7 +424,7 @@ class BaseClass5
 //
 // TEST: Remove parameter
 //
-class BaseClass6
+interface BaseInterface6
 {
     void baseOp();
     void baseOp2(int i, out string s) throws Exception1;
@@ -433,7 +433,7 @@ class BaseClass6
 //
 // TEST: Remove exception
 //
-class BaseClass7
+interface BaseInterface7
 {
     void baseOp();
     void baseOp2(int i, out string s) throws Exception1;
@@ -442,34 +442,16 @@ class BaseClass7
 //
 // TEST: Remove operation
 //
-class BaseClass8
+interface BaseInterface8
 {
     void baseOp();
     void baseOp2(int i, out string s) throws Exception1;
 };
 
 //
-// TEST: Add base class
-//
-class BaseClass9
-{
-    void baseOp();
-    void baseOp2(int i, out string s) throws Exception1;
-};
-
-//
-// TEST: Add interface
-//
-class BaseClass10
-{
-    void baseOp();
-    void baseOp2(int i, out string s) throws Exception1;
-};
-
-//
-// TEST: Add base class and interface
+// TEST: Add base interface
 //
-class BaseClass11
+interface BaseInterface9
 {
     void baseOp();
     void baseOp2(int i, out string s) throws Exception1;
@@ -480,8 +462,7 @@ class BaseClass11
 //
 class Compact1(1)
 {
-    void baseOp();
-    void baseOp2(int i, out string s) throws Exception1;
+    int id;
 };
 
 //
@@ -496,8 +477,7 @@ class Derived1 extends Compact1
 //
 class Compact2(2)
 {
-    void baseOp();
-    void baseOp2(int i, out string s) throws Exception1;
+    int id;
 };
 
 //
@@ -551,53 +531,53 @@ class Optional4
 };
 
 //
-// TEST: Class with optional parameters.
+// TEST: Interface with optional parameters.
 //
-class OptionalParameters0
+interface OptionalParameters0
 {
     void op1(string firstName, optional(1) string secondName,
              optional(2) string emailAddress);
 };
 
 //
-// TEST: Class with optional parameters, different order.
+// TEST: Interface with optional parameters, different order.
 //
-class OptionalParameters1
+interface OptionalParameters1
 {
     void op1(string firstName, optional(1) string secondName,
              optional(2) string emailAddress);
 };
 
 //
-// TEST: Class with optional parameters, different tags.
+// TEST: Interface with optional parameters, different tags.
 //
-class OptionalParameters2
+interface OptionalParameters2
 {
     void op1(string firstName, optional(1) string emailAddress,
              optional(2) string secondName);
 };
 
 //
-// TEST: Class with different optional parameters.
+// TEST: Interface with different optional parameters.
 //
-class OptionalParameters3
+interface OptionalParameters3
 {
     void op1(string firstName, optional(1) string emailAddress,
              string secondName);
 };
 
 //
-// TEST: Class with optional return type.
+// TEST: Interface with optional return type.
 //
-class OptionalReturn0
+interface OptionalReturn0
 {
     optional(1) int op();
 };
 
 //
-// TEST: Class that changes optional return type.
+// TEST: Interface that changes optional return type.
 //
-class OptionalReturn2
+interface OptionalReturn2
 {
     optional(1) int op();
 };
diff --git a/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice b/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice
index 0774d423249..a210ad16704 100644
--- a/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice
+++ b/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice
@@ -10,6 +10,7 @@
 #pragma once
 
 [["java:package:test.Ice.checksum.server"]]
+[["suppress-warning:deprecated"]] // For classes with operations
 module Test
 {
 
@@ -376,7 +377,7 @@ exception OptionalEx4
 //
 // TEST: Same
 //
-class BaseClass1
+interface BaseInterface1
 {
     void baseOp1();
     void baseOp2(int i, out string s) throws Exception1;
@@ -385,7 +386,7 @@ class BaseClass1
 //
 // TEST: Change return type
 //
-class BaseClass2
+interface BaseInterface2
 {
     int baseOp();
     void baseOp2(int i, out string s) throws Exception1;
@@ -394,7 +395,7 @@ class BaseClass2
 //
 // TEST: Add parameter
 //
-class BaseClass3
+interface BaseInterface3
 {
     void baseOp(Object o);
     void baseOp2(int i, out string s) throws Exception1;
@@ -403,7 +404,7 @@ class BaseClass3
 //
 // TEST: Add exception
 //
-class BaseClass4
+interface BaseInterface4
 {
     void baseOp();
     void baseOp2(int i, out string s) throws Exception1, Exception2;
@@ -412,7 +413,7 @@ class BaseClass4
 //
 // TEST: Change out parameter to in parameter
 //
-class BaseClass5
+interface BaseInterface5
 {
     void baseOp();
     void baseOp2(int i, string s) throws Exception1;
@@ -421,7 +422,7 @@ class BaseClass5
 //
 // TEST: Remove parameter
 //
-class BaseClass6
+interface BaseInterface6
 {
     void baseOp();
     void baseOp2(out string s) throws Exception1;
@@ -430,7 +431,7 @@ class BaseClass6
 //
 // TEST: Remove exception
 //
-class BaseClass7
+interface BaseInterface7
 {
     void baseOp();
     void baseOp2(int i, out string s);
@@ -439,7 +440,7 @@ class BaseClass7
 //
 // TEST: Remove operation
 //
-class BaseClass8
+interface BaseInterface8
 {
     void baseOp2(int i, out string s) throws Exception1;
 };
@@ -447,25 +448,7 @@ class BaseClass8
 //
 // TEST: Add base class
 //
-class BaseClass9 extends EmptyClass1
-{
-    void baseOp();
-    void baseOp2(int i, out string s) throws Exception1;
-};
-
-//
-// TEST: Add interface
-//
-class BaseClass10 implements Interface1
-{
-    void baseOp();
-    void baseOp2(int i, out string s) throws Exception1;
-};
-
-//
-// TEST: Add base class and interface
-//
-class BaseClass11 extends EmptyClass1 implements Interface1
+interface BaseInterface9 extends Interface1
 {
     void baseOp();
     void baseOp2(int i, out string s) throws Exception1;
@@ -476,8 +459,7 @@ class BaseClass11 extends EmptyClass1 implements Interface1
 //
 class Compact1(1)
 {
-    void baseOp();
-    void baseOp2(int i, out string s) throws Exception1;
+    int id;
 };
 
 //
@@ -492,8 +474,7 @@ class Derived1 extends Compact1
 //
 class Compact2(3)
 {
-    void baseOp();
-    void baseOp2(int i, out string s) throws Exception1;
+    int id;
 };
 
 //
@@ -507,7 +488,7 @@ class Optional0
 };
 
 //
-// TEST: Class with optional members, different order, same tags.
+// TEST: Interface with optional members, different order, same tags.
 //
 class Optional1
 {
@@ -517,7 +498,7 @@ class Optional1
 };
 
 //
-// TEST: Class with different optional members.
+// TEST: Interface with different optional members.
 //
 class Optional2
 {
@@ -527,7 +508,7 @@ class Optional2
 };
 
 //
-// TEST: Class with different optional members.
+// TEST: Interface with different optional members.
 //
 class Optional3
 {
@@ -538,7 +519,7 @@ class Optional3
 };
 
 //
-// TEST: Class with optional members using different tags.
+// TEST: Interface with optional members using different tags.
 //
 class Optional4
 {
@@ -548,53 +529,53 @@ class Optional4
 };
 
 //
-// TEST: Class with optional parameters.
+// TEST: Interface with optional parameters.
 //
-class OptionalParameters0
+interface OptionalParameters0
 {
     void op1(string firstName, optional(1) string secondName,
              optional(2) string emailAddress);
 };
 
 //
-// TEST: Class with optional parameters, different order.
+// TEST: Interface with optional parameters, different order.
 //
-class OptionalParameters1
+interface OptionalParameters1
 {
     void op1(string firstName, optional(2) string emailAddress,
              optional(1) string secondName);
 };
 
 //
-// TEST: Class with optional parameters, different tags.
+// TEST: Interface with optional parameters, different tags.
 //
-class OptionalParameters2
+interface OptionalParameters2
 {
     void op1(string firstName, optional(2) string emailAddress,
              optional(1) string secondName);
 };
 
 //
-// TEST: Class with different optional parameters.
+// TEST: Interface with different optional parameters.
 //
-class OptionalParameters3
+interface OptionalParameters3
 {
     void op1(string firstName, string emailAddress,
              optional(1) string secondName);
 };
 
 //
-// TEST: Class with optional return type.
+// TEST: Interface with optional return type.
 //
-class OptionalReturn0
+interface OptionalReturn0
 {
     optional(1) int op();
 };
 
 //
-// TEST: Class that changes optional return type.
+// TEST: Interface that changes optional return type.
 //
-class OptionalReturn2
+interface OptionalReturn2
 {
     int op();
 };
diff --git a/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice b/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice
index 551c600020f..910df84e1ad 100644
--- a/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice
+++ b/java-compat/test/src/main/java/test/Ice/classLoader/Test.ice
@@ -10,6 +10,7 @@
 #pragma once
 
 [["java:package:test.Ice.classLoader"]]
+[["suppress-warning:deprecated"]] // For classes with operations
 module Test
 {
 
diff --git a/java-compat/test/src/main/java/test/Ice/custom/Test.ice b/java-compat/test/src/main/java/test/Ice/custom/Test.ice
index 42d7faae656..e17a1e315b4 100644
--- a/java-compat/test/src/main/java/test/Ice/custom/Test.ice
+++ b/java-compat/test/src/main/java/test/Ice/custom/Test.ice
@@ -51,7 +51,7 @@ dictionary<int, string> D;
 
 ["java:type:java.util.LinkedList<java.util.List<String>>"] sequence<StringSeq> StringSeqSeq;
 
-class TestIntf
+interface TestIntf
 {
     CSeq opCSeq(CSeq inSeq, out CSeq outSeq);
     CArray opCArray(CArray inSeq, out CArray outSeq);
@@ -77,8 +77,6 @@ class TestIntf
     DoubleBuffer opDoubleBufferSeq(DoubleBuffer inSeq, out DoubleBuffer outSeq);
 
     void shutdown();
-
-    ["java:type:java.util.ArrayList<C>"] CSeq seq;
 };
 
 };
diff --git a/java-compat/test/src/main/java/test/Ice/custom/TestI.java b/java-compat/test/src/main/java/test/Ice/custom/TestI.java
index 6ce5451516f..77e9f8f02cb 100644
--- a/java-compat/test/src/main/java/test/Ice/custom/TestI.java
+++ b/java-compat/test/src/main/java/test/Ice/custom/TestI.java
@@ -38,9 +38,9 @@ import test.Ice.custom.Test.SSeqHolder;
 import test.Ice.custom.Test.ShortSeqHolder;
 import test.Ice.custom.Test.StringSeqHolder;
 import test.Ice.custom.Test.StringSeqSeqHolder;
-import test.Ice.custom.Test.TestIntf;
+import test.Ice.custom.Test._TestIntfDisp;
 
-public final class TestI extends TestIntf
+public final class TestI extends _TestIntfDisp
 {
     public
     TestI(Ice.Communicator communicator)
@@ -238,4 +238,5 @@ public final class TestI extends TestIntf
     }
 
     private Ice.Communicator _communicator;
+    private java.util.ArrayList<C> seq;
 }
diff --git a/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice b/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice
index 4e0281ef5df..3e630c25ae4 100644
--- a/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice
+++ b/java-compat/test/src/main/java/test/Ice/defaultValue/Test.ice
@@ -10,6 +10,7 @@
 #pragma once
 
 [["java:package:test.Ice.defaultValue"]]
+[["suppress-warning:deprecated"]] // For enumerator references
 module Test
 {
 
diff --git a/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice b/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice
index 83f212381cb..f48ff12cc93 100644
--- a/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice
+++ b/java-compat/test/src/main/java/test/Ice/inheritance/Test.ice
@@ -10,6 +10,8 @@
 #pragma once
 
 [["java:package:test.Ice.inheritance"]]
+[["suppress-warning:deprecated"]] // For classes with operations
+
 module Test
 {
 
diff --git a/java-compat/test/src/main/java/test/Ice/invoke/Test.ice b/java-compat/test/src/main/java/test/Ice/invoke/Test.ice
index aca42de1940..145b9dc0da3 100644
--- a/java-compat/test/src/main/java/test/Ice/invoke/Test.ice
+++ b/java-compat/test/src/main/java/test/Ice/invoke/Test.ice
@@ -17,7 +17,7 @@ exception MyException
 {
 };
 
-class MyClass
+interface MyClass
 {
     void opOneway();
 
diff --git a/java-compat/test/src/main/java/test/Ice/objects/Test.ice b/java-compat/test/src/main/java/test/Ice/objects/Test.ice
index 6172f7f3323..d7ba9284d6c 100644
--- a/java-compat/test/src/main/java/test/Ice/objects/Test.ice
+++ b/java-compat/test/src/main/java/test/Ice/objects/Test.ice
@@ -10,6 +10,8 @@
 #pragma once
 
 [["java:package:test.Ice.objects"]]
+[["suppress-warning:deprecated"]] // For classes with operations
+
 module Test
 {
 
diff --git a/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java b/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
index 6243298e8aa..33c86b7678a 100644
--- a/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
+++ b/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java
@@ -14,7 +14,7 @@ import test.Ice.operations.AMD.Test.*;
 
 import java.util.*;
 
-public final class AMDMyDerivedClassI extends MyDerivedClass
+public final class AMDMyDerivedClassI extends _MyDerivedClassDisp
 {
     private static void
     test(boolean b)
diff --git a/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java b/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
index 73cf592f958..a2d5c82455b 100644
--- a/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java
@@ -14,7 +14,7 @@ import test.Ice.operations.Test.*;
 
 import java.util.*;
 
-public final class MyDerivedClassI extends MyDerivedClass
+public final class MyDerivedClassI extends _MyDerivedClassDisp
 {
     private static void
     test(boolean b)
diff --git a/java-compat/test/src/main/java/test/Ice/operations/Test.ice b/java-compat/test/src/main/java/test/Ice/operations/Test.ice
index faf3f2cb495..d792df8a858 100644
--- a/java-compat/test/src/main/java/test/Ice/operations/Test.ice
+++ b/java-compat/test/src/main/java/test/Ice/operations/Test.ice
@@ -22,7 +22,7 @@ enum MyEnum
     enum3
 };
 
-class MyClass;
+interface MyClass;
 
 struct AnotherStruct
 {
@@ -92,7 +92,7 @@ dictionary<string, DoubleS> StringDoubleSD;
 dictionary<string, StringS> StringStringSD;
 dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD;
 
-class MyClass
+interface MyClass
 {
     void shutdown();
 
@@ -276,7 +276,7 @@ class MyClass1
     string myClass1; // Same name as the enclosing class
 };
 
-["java:tie"] class MyDerivedClass extends MyClass
+["java:tie"] interface MyDerivedClass extends MyClass
 {
     void opDerived();
     MyClass1 opMyClass1(MyClass1 opMyClass1);
diff --git a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice
index fb5d05a1f12..45006b9b282 100644
--- a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice
+++ b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice
@@ -22,7 +22,7 @@ enum MyEnum
     enum3
 };
 
-class MyClass;
+interface MyClass;
 
 struct AnotherStruct
 {
@@ -92,7 +92,7 @@ dictionary<string, DoubleS> StringDoubleSD;
 dictionary<string, StringS> StringStringSD;
 dictionary<MyEnum, MyEnumS> MyEnumMyEnumSD;
 
-["amd"] class MyClass
+["amd"] interface MyClass
 {
     void shutdown();
 
@@ -276,7 +276,7 @@ class MyClass1
     string myClass1; // Same name as the enclosing class
 };
 
-["amd", "java:tie"] class MyDerivedClass extends MyClass
+["amd", "java:tie"] interface MyDerivedClass extends MyClass
 {
     void opDerived();
     MyClass1 opMyClass1(MyClass1 opMyClass1);
diff --git a/java-compat/test/src/main/java/test/Ice/operations/Twoways.java b/java-compat/test/src/main/java/test/Ice/operations/Twoways.java
index 189c448d309..04f6858ba31 100644
--- a/java-compat/test/src/main/java/test/Ice/operations/Twoways.java
+++ b/java-compat/test/src/main/java/test/Ice/operations/Twoways.java
@@ -137,11 +137,11 @@ class Twoways
 
         p.ice_ping();
 
-        test(p.ice_isA(MyClass.ice_staticId()));
+        test(p.ice_isA(_MyClassDisp.ice_staticId()));
 
-        test(p.ice_id().equals(MyDerivedClass.ice_staticId()));
+        test(p.ice_id().equals(_MyDerivedClassDisp.ice_staticId()));
 
-        test(MyDerivedClassPrxHelper.ice_staticId().equals(MyDerivedClass.ice_staticId()));
+        test(MyDerivedClassPrxHelper.ice_staticId().equals(_MyDerivedClassDisp.ice_staticId()));
         test(ObjectPrxHelper.ice_staticId().equals(Object.ice_staticId));
         test(LocatorPrxHelper.ice_staticId().equals(Locator.ice_staticId));
 
diff --git a/java-compat/test/src/main/java/test/Ice/operations/TwowaysAMI.java b/java-compat/test/src/main/java/test/Ice/operations/TwowaysAMI.java
index 7a0a441d27c..e5f0e71e901 100644
--- a/java-compat/test/src/main/java/test/Ice/operations/TwowaysAMI.java
+++ b/java-compat/test/src/main/java/test/Ice/operations/TwowaysAMI.java
@@ -62,10 +62,10 @@ import test.Ice.operations.Test.Callback_MyClass_opStringStringSD;
 import test.Ice.operations.Test.Callback_MyClass_opStruct;
 import test.Ice.operations.Test.Callback_MyClass_opVoid;
 import test.Ice.operations.Test.Callback_MyDerivedClass_opDerived;
-import test.Ice.operations.Test.MyClass;
+import test.Ice.operations.Test._MyClassDisp;
 import test.Ice.operations.Test.MyClassPrx;
 import test.Ice.operations.Test.MyClassPrxHelper;
-import test.Ice.operations.Test.MyDerivedClass;
+import test.Ice.operations.Test._MyDerivedClassDisp;
 import test.Ice.operations.Test.MyDerivedClassPrx;
 import test.Ice.operations.Test.MyDerivedClassPrxHelper;
 import test.Ice.operations.Test.MyEnum;
@@ -206,7 +206,7 @@ class TwowaysAMI
         @Override
         public void response(String id)
         {
-            test(id.equals(MyDerivedClass.ice_staticId()));
+            test(id.equals(_MyDerivedClassDisp.ice_staticId()));
             callback.called();
         }
 
@@ -1921,7 +1921,7 @@ class TwowaysAMI
 
         {
             isAI cb = new isAI();
-            p.begin_ice_isA(MyClass.ice_staticId(), cb);
+            p.begin_ice_isA(_MyClassDisp.ice_staticId(), cb);
             cb.check();
         }
 
diff --git a/java-compat/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java b/java-compat/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java
index 204790269c7..fdf51d2c398 100644
--- a/java-compat/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java
+++ b/java-compat/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java
@@ -10,9 +10,9 @@
 package test.Ice.operations.lambda;
 
 import test.Ice.operations.Test.AnotherStruct;
-import test.Ice.operations.Test.MyClass;
+import test.Ice.operations.Test._MyClassDisp;
 import test.Ice.operations.Test.MyClassPrx;
-import test.Ice.operations.Test.MyDerivedClass;
+import test.Ice.operations.Test._MyDerivedClassDisp;
 import test.Ice.operations.Test.MyDerivedClassPrx;
 import test.Ice.operations.Test.MyDerivedClassPrxHelper;
 import test.Ice.operations.Test.MyEnum;
@@ -100,7 +100,7 @@ public class TwowaysLambdaAMI
     {
         public void response(String id)
         {
-            test(id.equals(MyDerivedClass.ice_staticId()));
+            test(id.equals(_MyDerivedClassDisp.ice_staticId()));
             callback.called();
         }
 
@@ -947,7 +947,7 @@ public class TwowaysLambdaAMI
 
         {
             isAI cb = new isAI();
-            p.begin_ice_isA(MyClass.ice_staticId(), (boolean r) -> cb.response(r), (Ice.Exception ex) -> test(false));
+            p.begin_ice_isA(_MyClassDisp.ice_staticId(), (boolean r) -> cb.response(r), (Ice.Exception ex) -> test(false));
             cb.check();
         }
 
diff --git a/java-compat/test/src/main/java/test/Ice/optional/AMDInitialI.java b/java-compat/test/src/main/java/test/Ice/optional/AMDInitialI.java
index 3bd97d11755..47526a926dd 100644
--- a/java-compat/test/src/main/java/test/Ice/optional/AMDInitialI.java
+++ b/java-compat/test/src/main/java/test/Ice/optional/AMDInitialI.java
@@ -11,7 +11,7 @@ package test.Ice.optional;
 
 import test.Ice.optional.AMD.Test.*;
 
-public final class AMDInitialI extends Initial
+public final class AMDInitialI extends _InitialDisp
 {
     @Override
     public void
diff --git a/java-compat/test/src/main/java/test/Ice/optional/InitialI.java b/java-compat/test/src/main/java/test/Ice/optional/InitialI.java
index ffa2dbd11e1..505805ee795 100644
--- a/java-compat/test/src/main/java/test/Ice/optional/InitialI.java
+++ b/java-compat/test/src/main/java/test/Ice/optional/InitialI.java
@@ -11,7 +11,7 @@ package test.Ice.optional;
 
 import test.Ice.optional.Test.*;
 
-public final class InitialI extends Initial
+public final class InitialI extends _InitialDisp
 {
     @Override
     public void
diff --git a/java-compat/test/src/main/java/test/Ice/optional/Test.ice b/java-compat/test/src/main/java/test/Ice/optional/Test.ice
index 596f2102d77..bdc71ef5ba2 100644
--- a/java-compat/test/src/main/java/test/Ice/optional/Test.ice
+++ b/java-compat/test/src/main/java/test/Ice/optional/Test.ice
@@ -197,7 +197,7 @@ class Recursive {
     optional(0) RecursiveSeq value;
 };
 
-class Initial
+interface Initial
 {
     void shutdown();
 
diff --git a/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice
index 2fc1437cf73..4ff299271c0 100644
--- a/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice
+++ b/java-compat/test/src/main/java/test/Ice/optional/TestAMD.ice
@@ -193,12 +193,13 @@ class G
 class Recursive;
 sequence<Recursive> RecursiveSeq;
 
-class Recursive {
+class Recursive
+{
     optional(0) RecursiveSeq value;
 };
 
 ["amd"]
-class Initial
+interface Initial
 {
     void shutdown();
 
diff --git a/java-compat/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java b/java-compat/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java
index 68886fa161c..3e522f64775 100644
--- a/java-compat/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java
+++ b/java-compat/test/src/main/java/test/Ice/proxy/AMDMyDerivedClassI.java
@@ -11,9 +11,9 @@ package test.Ice.proxy;
 import test.Ice.proxy.AMD.Test.AMD_MyClass_getContext;
 import test.Ice.proxy.AMD.Test.AMD_MyClass_shutdown;
 import test.Ice.proxy.AMD.Test.AMD_MyDerivedClass_echo;
-import test.Ice.proxy.AMD.Test.MyDerivedClass;
+import test.Ice.proxy.AMD.Test._MyDerivedClassDisp;
 
-public final class AMDMyDerivedClassI extends MyDerivedClass
+public final class AMDMyDerivedClassI extends _MyDerivedClassDisp
 {
     public
     AMDMyDerivedClassI()
diff --git a/java-compat/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java b/java-compat/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java
index ed8036499b0..1e4baccbc5c 100644
--- a/java-compat/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java
+++ b/java-compat/test/src/main/java/test/Ice/proxy/MyDerivedClassI.java
@@ -8,9 +8,9 @@
 // **********************************************************************
 
 package test.Ice.proxy;
-import test.Ice.proxy.Test.MyDerivedClass;
+import test.Ice.proxy.Test._MyDerivedClassDisp;
 
-public final class MyDerivedClassI extends MyDerivedClass
+public final class MyDerivedClassI extends _MyDerivedClassDisp
 {
     public
     MyDerivedClassI()
diff --git a/java-compat/test/src/main/java/test/Ice/proxy/Test.ice b/java-compat/test/src/main/java/test/Ice/proxy/Test.ice
index b902f6868d7..9e2239674b2 100644
--- a/java-compat/test/src/main/java/test/Ice/proxy/Test.ice
+++ b/java-compat/test/src/main/java/test/Ice/proxy/Test.ice
@@ -15,14 +15,14 @@
 module Test
 {
 
-class MyClass
+interface MyClass
 {
     void shutdown();
 
     Ice::Context getContext();
 };
 
-class MyDerivedClass extends MyClass
+interface MyDerivedClass extends MyClass
 {
     Object* echo(Object* obj);
 };
diff --git a/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice
index 1cda6a8c5f9..7b1bbb70559 100644
--- a/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice
+++ b/java-compat/test/src/main/java/test/Ice/proxy/TestAMD.ice
@@ -15,14 +15,14 @@
 module Test
 {
 
-["amd"] class MyClass
+["amd"] interface MyClass
 {
     void shutdown();
 
     Ice::Context getContext();
 };
 
-["amd"] class MyDerivedClass extends MyClass
+["amd"] interface MyDerivedClass extends MyClass
 {
     Object* echo(Object* obj);
 };
diff --git a/java-compat/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java b/java-compat/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java
index 7f5ea811728..22db08eb06b 100644
--- a/java-compat/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java
+++ b/java-compat/test/src/main/java/test/Ice/seqMapping/AMDMyClassI.java
@@ -12,7 +12,7 @@ package test.Ice.seqMapping;
 import test.Ice.seqMapping.AMD.Test.*;
 import test.Ice.seqMapping.Serialize.*;
 
-public final class AMDMyClassI extends MyClass
+public final class AMDMyClassI extends _MyClassDisp
 {
     @Override
     public void
diff --git a/java-compat/test/src/main/java/test/Ice/seqMapping/MyClassI.java b/java-compat/test/src/main/java/test/Ice/seqMapping/MyClassI.java
index ced4817bdb5..6e086cd532f 100644
--- a/java-compat/test/src/main/java/test/Ice/seqMapping/MyClassI.java
+++ b/java-compat/test/src/main/java/test/Ice/seqMapping/MyClassI.java
@@ -12,7 +12,7 @@ package test.Ice.seqMapping;
 import test.Ice.seqMapping.Test.*;
 import test.Ice.seqMapping.Serialize.*;
 
-public final class MyClassI extends MyClass
+public final class MyClassI extends _MyClassDisp
 {
     @Override
     public void
diff --git a/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice b/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice
index df46b2e5d47..2946052e37a 100644
--- a/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice
+++ b/java-compat/test/src/main/java/test/Ice/seqMapping/Test.ice
@@ -17,7 +17,7 @@ module Test
 ["java:serializable:test.Ice.seqMapping.Serialize.Large"] sequence<byte> SerialLarge;
 ["java:serializable:test.Ice.seqMapping.Serialize.Struct"] sequence<byte> SerialStruct;
 
-class MyClass
+interface MyClass
 {
     void shutdown();
 
diff --git a/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice
index f01c1f80e18..3c94895b5c9 100644
--- a/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice
+++ b/java-compat/test/src/main/java/test/Ice/seqMapping/TestAMD.ice
@@ -17,7 +17,7 @@ module Test
 ["java:serializable:test.Ice.seqMapping.Serialize.Large"] sequence<byte> SerialLarge;
 ["java:serializable:test.Ice.seqMapping.Serialize.Struct"] sequence<byte> SerialStruct;
 
-["amd"] class MyClass
+["amd"] interface MyClass
 {
     void shutdown();
 
diff --git a/java-compat/test/src/main/java/test/Slice/escape/Client.java b/java-compat/test/src/main/java/test/Slice/escape/Client.java
index 380d82025ac..28384cdb397 100644
--- a/java-compat/test/src/main/java/test/Slice/escape/Client.java
+++ b/java-compat/test/src/main/java/test/Slice/escape/Client.java
@@ -68,12 +68,6 @@ public class Client
         elseI()
         {
         }
-
-        @Override
-        public void
-        foo(defaultPrx _equals, Ice.IntHolder _final, Ice.Current current)
-        {
-        }
     }
 
     static public class newI implements _new
@@ -114,12 +108,6 @@ public class Client
         _do(Ice.Current current)
         {
         }
-
-        @Override
-        public void
-        foo(defaultPrx _equals, Ice.IntHolder _final, Ice.Current current)
-        {
-        }
     }
 
     //
@@ -141,6 +129,9 @@ public class Client
         _default d1 = new defaultI();
         elsePrx e;
         _else e1 = new elseI();
+        e1._if = 0;
+        e1._equals = null;
+        e1._final = 0;
         finalizePrx f = null;
         f._checkedCast(0, new Ice.IntHolder());
         f._do();
diff --git a/java-compat/test/src/main/java/test/Slice/escape/Key.ice b/java-compat/test/src/main/java/test/Slice/escape/Key.ice
index 9548461f36d..c74b7a4c2c8 100644
--- a/java-compat/test/src/main/java/test/Slice/escape/Key.ice
+++ b/java-compat/test/src/main/java/test/Slice/escape/Key.ice
@@ -36,7 +36,8 @@ interface default
 class else
 {
     int if;
-    void foo(default* equals, out int final);
+    default* equals;
+    int final;
 };
 
 class finalize extends else implements default, catch