diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-08-12 15:50:25 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-08-12 15:50:25 -0230 |
| commit | 2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b (patch) | |
| tree | b460e22e91a9fbb9cfb71631303963fa94dd2c9c /java/test | |
| parent | ICE-5492 Tcp Loopback Fast Path for C#/C++ on Windows (diff) | |
| download | ice-2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b.tar.bz2 ice-2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b.tar.xz ice-2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b.zip | |
Added eclipse project settings for java.
Fix lots of warnings in Ice for Java.
Diffstat (limited to 'java/test')
278 files changed, 1667 insertions, 418 deletions
diff --git a/java/test/Freeze/dbmap/Client.java b/java/test/Freeze/dbmap/Client.java index 36c83c9e0e6..fe6c9a06680 100644 --- a/java/test/Freeze/dbmap/Client.java +++ b/java/test/Freeze/dbmap/Client.java @@ -15,6 +15,7 @@ public class Client { static class ReadThread extends Thread { + @Override public void run() { @@ -59,7 +60,7 @@ public class Client } finally { - ((Freeze.Map)_map).close(); + ((Freeze.Map<Byte, Integer>)_map).close(); _connection.close(); } } @@ -76,6 +77,7 @@ public class Client static class WriteThread extends Thread { + @Override public void run() { @@ -128,7 +130,7 @@ public class Client } finally { - ((Freeze.Map)_map).close(); + ((Freeze.Map<Byte, Integer>)_map).close(); _connection.close(); } } @@ -279,7 +281,7 @@ public class Client // // The iterator should have already been closed when we reached the last entry. // - int count = ((Freeze.Map)m).closeAllIterators(); + int count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 0); try @@ -292,7 +294,7 @@ public class Client // Expected - no transaction. } - count = ((Freeze.Map)m).closeAllIterators(); + count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 1); // Opened by keys.remove() Transaction tx = connection.beginTransaction(); @@ -331,7 +333,7 @@ public class Client // // The iterator should have already been closed when we reached the last entry. // - int count = ((Freeze.Map)m).closeAllIterators(); + int count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 0); try @@ -344,7 +346,7 @@ public class Client // Expected - no transaction. } - count = ((Freeze.Map)m).closeAllIterators(); + count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 1); // Opened by keys.remove() Transaction tx = connection.beginTransaction(); @@ -379,7 +381,7 @@ public class Client // // The iterator should have already been closed when we reached the last entry. // - int count = ((Freeze.Map)m).closeAllIterators(); + int count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 0); System.out.println("ok"); } @@ -478,12 +480,12 @@ public class Client e = nm.firstEntry(); test(e != null); - test(e.getKey().byteValue() == (byte)firstByte); + test(e.getKey().byteValue() == firstByte); test(e.getValue().intValue() == 0); e = nm.lastEntry(); test(e != null); - test(e.getKey().byteValue() == (byte)lastByte); + test(e.getKey().byteValue() == lastByte); test(e.getValue().intValue() == length - 1); try @@ -528,13 +530,13 @@ public class Client e = nm.pollFirstEntry(); test(e != null); - test(e.getKey().byteValue() == (byte)firstByte); + test(e.getKey().byteValue() == firstByte); test(e.getValue().intValue() == 0); test(!nm.containsKey(firstByte)); e = nm.pollLastEntry(); test(e != null); - test(e.getKey().byteValue() == (byte)lastByte); + test(e.getKey().byteValue() == lastByte); test(e.getValue().intValue() == length - 1); test(!nm.containsKey(lastByte)); @@ -600,7 +602,7 @@ public class Client // // The iterator should have already been closed when we reached the last entry. // - int count = ((Freeze.Map)m).closeAllIterators(); + int count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 0); System.out.println("ok"); @@ -918,7 +920,7 @@ public class Client System.out.println("ok"); } - ((Freeze.Map)m).closeAllIterators(); + ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); { System.out.print("testing concurrent access... "); @@ -1037,6 +1039,7 @@ public class Client final java.util.Comparator<Integer> less = new java.util.Comparator<Integer>() { + @Override public int compare(Integer i1, Integer i2) { if(i1 == i2) @@ -1056,6 +1059,7 @@ public class Client java.util.Comparator<String> greater = new java.util.Comparator<String>() { + @Override public int compare(String s1, String s2) { if(s1 == s2) @@ -1102,7 +1106,6 @@ public class Client { final Integer first = sm.firstKey(); - final Integer last = sm.lastKey(); // // fastRemove diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java index e397a0c4223..a5e649fdf48 100644 --- a/java/test/Freeze/evictor/Client.java +++ b/java/test/Freeze/evictor/Client.java @@ -272,14 +272,14 @@ public class Client extends test.Util.Application } else { - ServantPrx servant = _evictor.createServant(id, i); + _evictor.createServant(id, i); // // Twice // try { - servant = _evictor.createServant(id, 0); + _evictor.createServant(id, 0); test(false); } catch(AlreadyRegisteredException e) @@ -584,7 +584,7 @@ public class Client extends test.Util.Application // try { - int balance = AccountPrxHelper.uncheckedCast(servants[0]).getBalance(); + AccountPrxHelper.uncheckedCast(servants[0]).getBalance(); test(false); } catch(Ice.OperationNotExistException ex) @@ -894,7 +894,7 @@ public class Client extends test.Util.Application try { - Thread.currentThread().sleep(500); + Thread.sleep(500); } catch(InterruptedException e) { @@ -949,7 +949,7 @@ public class Client extends test.Util.Application try { - Thread.currentThread().sleep(500); + Thread.sleep(500); } catch(InterruptedException e) { diff --git a/java/test/Freeze/fileLock/Client.java b/java/test/Freeze/fileLock/Client.java index 886ed7e8ae6..8b8fd8c13a2 100644 --- a/java/test/Freeze/fileLock/Client.java +++ b/java/test/Freeze/fileLock/Client.java @@ -12,8 +12,6 @@ package test.Freeze.fileLock; import java.io.BufferedReader; import java.io.InputStreamReader; -import Freeze.*; - public class Client { private static void @@ -53,7 +51,7 @@ public class Client BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); try { - String dummy = br.readLine(); + br.readLine(); } catch(java.io.IOException ex) { diff --git a/java/test/Freeze/fileLock/ClientFail.java b/java/test/Freeze/fileLock/ClientFail.java index 4fc19d88a20..2c589a90eb1 100644 --- a/java/test/Freeze/fileLock/ClientFail.java +++ b/java/test/Freeze/fileLock/ClientFail.java @@ -9,11 +9,6 @@ package test.Freeze.fileLock; -import java.io.BufferedReader; -import java.io.InputStreamReader; - -import Freeze.*; - public class ClientFail { private static void @@ -44,10 +39,9 @@ public class ClientFail envName += "db"; } - Freeze.Connection connection = null; try { - connection = Freeze.Util.createConnection(communicator, envName); + Freeze.Util.createConnection(communicator, envName); test(false); } catch(IceUtil.FileLockException ex) diff --git a/java/test/Glacier2/router/Client.java b/java/test/Glacier2/router/Client.java index 63090711dff..257e81c12cd 100644 --- a/java/test/Glacier2/router/Client.java +++ b/java/test/Glacier2/router/Client.java @@ -115,14 +115,12 @@ public class Client extends test.Util.Application } } - Glacier2.SessionPrx session; - { out.print("trying to create session with wrong password... "); out.flush(); try { - session = router.createSession("userid", "xxx"); + router.createSession("userid", "xxx"); test(false); } catch(Glacier2.PermissionDeniedException ex) @@ -154,7 +152,7 @@ public class Client extends test.Util.Application out.flush(); try { - session = router.createSession("userid", "abc123"); + router.createSession("userid", "abc123"); } catch(Glacier2.PermissionDeniedException ex) { diff --git a/java/test/Glacier2/sessionHelper/Client.java b/java/test/Glacier2/sessionHelper/Client.java index 2a93f6c5d1e..faaf05536a3 100644 --- a/java/test/Glacier2/sessionHelper/Client.java +++ b/java/test/Glacier2/sessionHelper/Client.java @@ -11,13 +11,8 @@ package test.Glacier2.sessionHelper; import javax.swing.SwingUtilities; import java.io.PrintWriter; -import java.io.StringWriter; - -import test.Glacier2.sessionHelper.Test.CallbackException; import test.Glacier2.sessionHelper.Test.CallbackPrx; import test.Glacier2.sessionHelper.Test.CallbackPrxHelper; -import test.Glacier2.sessionHelper.Test.CallbackReceiverPrx; -import test.Glacier2.sessionHelper.Test.CallbackReceiverPrxHelper; public class Client extends test.Util.Application { @@ -36,6 +31,7 @@ public class Client extends test.Util.Application } } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { _initData = new Ice.InitializationData(); @@ -43,6 +39,7 @@ public class Client extends test.Util.Application _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:default -p 12347"); _initData.dispatcher = new Ice.Dispatcher() { + @Override public void dispatch(Runnable runnable, Ice.Connection connection) { @@ -53,10 +50,12 @@ public class Client extends test.Util.Application return _initData; } + @Override public int run(String[] args) { _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback() { + @Override public void connected(Glacier2.SessionHelper session) throws Glacier2.SessionNotExistException @@ -64,12 +63,14 @@ public class Client extends test.Util.Application test(false); } + @Override public void disconnected(Glacier2.SessionHelper session) { test(false); } + @Override public void connectFailed(Glacier2.SessionHelper session, Throwable exception) { @@ -91,6 +92,7 @@ public class Client extends test.Util.Application } } + @Override public void createdCommunicator(Glacier2.SessionHelper session) { @@ -126,6 +128,7 @@ public class Client extends test.Util.Application _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback() { + @Override public void connected(Glacier2.SessionHelper session) throws Glacier2.SessionNotExistException @@ -137,6 +140,7 @@ public class Client extends test.Util.Application } } + @Override public void disconnected(Glacier2.SessionHelper session) { @@ -147,12 +151,14 @@ public class Client extends test.Util.Application } } + @Override public void connectFailed(Glacier2.SessionHelper session, Throwable ex) { test(false); } + @Override public void createdCommunicator(Glacier2.SessionHelper session) { @@ -264,7 +270,7 @@ public class Client extends test.Util.Application out.print("testing SessionHelper session after destroy... "); try { - Glacier2.SessionPrx session = _session.session(); + _session.session(); test(false); } catch(Glacier2.SessionNotExistException ex) @@ -314,6 +320,7 @@ public class Client extends test.Util.Application _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback() { + @Override public void connected(Glacier2.SessionHelper session) throws Glacier2.SessionNotExistException @@ -321,12 +328,14 @@ public class Client extends test.Util.Application test(false); } + @Override public void disconnected(Glacier2.SessionHelper session) { test(false); } + @Override public void connectFailed(Glacier2.SessionHelper session, Throwable exception) { @@ -348,6 +357,7 @@ public class Client extends test.Util.Application } } + @Override public void createdCommunicator(Glacier2.SessionHelper session) { diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java index c89910e36a2..05cbc8f3d59 100644 --- a/java/test/Ice/adapterDeactivation/AllTests.java +++ b/java/test/Ice/adapterDeactivation/AllTests.java @@ -9,8 +9,6 @@ package test.Ice.adapterDeactivation; -import java.io.PrintStream; - import test.Ice.adapterDeactivation.Test.TestIntfPrx; import test.Ice.adapterDeactivation.Test.TestIntfPrxHelper; diff --git a/java/test/Ice/ami/AMI.java b/java/test/Ice/ami/AMI.java index 9a067ea6bcc..67c6920d142 100644 --- a/java/test/Ice/ami/AMI.java +++ b/java/test/Ice/ami/AMI.java @@ -14,7 +14,6 @@ import java.io.PrintWriter; import test.Ice.ami.Test.TestIntfPrx; import test.Ice.ami.Test.TestIntfPrxHelper; import test.Ice.ami.Test.TestIntfControllerPrx; -import test.Ice.ami.Test.TestIntfControllerPrxHelper; import test.Ice.ami.Test.TestIntfException; import test.Ice.ami.Test.Callback_TestIntf_op; import test.Ice.ami.Test.Callback_TestIntf_opWithResult; @@ -619,6 +618,7 @@ public class AMI p.begin_ice_isA("::Test::TestIntf", new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -629,6 +629,7 @@ public class AMI p.begin_ice_isA("::Test::TestIntf", ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -639,6 +640,7 @@ public class AMI p.begin_ice_ping(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -648,6 +650,7 @@ public class AMI cb.check(); p.begin_ice_ping(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -658,6 +661,7 @@ public class AMI p.begin_ice_id(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -667,6 +671,7 @@ public class AMI cb.check(); p.begin_ice_id(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -677,6 +682,7 @@ public class AMI p.begin_ice_ids(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -686,6 +692,7 @@ public class AMI cb.check(); p.begin_ice_ids(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -696,6 +703,7 @@ public class AMI p.begin_op(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -705,6 +713,7 @@ public class AMI cb.check(); p.begin_op(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -715,6 +724,7 @@ public class AMI p.begin_opWithResult(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -724,6 +734,7 @@ public class AMI cb.check(); p.begin_opWithResult(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -734,6 +745,7 @@ public class AMI p.begin_opWithUE(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -743,6 +755,7 @@ public class AMI cb.check(); p.begin_opWithUE(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -761,12 +774,14 @@ public class AMI p.begin_ice_isA("::Test::TestIntf", new Ice.Callback_Object_ice_isA() { + @Override public void response(boolean r) { cb.isA(r); } + @Override public void exception(Ice.LocalException ex) { @@ -776,12 +791,14 @@ public class AMI cb.check(); p.begin_ice_isA("::Test::TestIntf", ctx, new Ice.Callback_Object_ice_isA() { + @Override public void response(boolean r) { cb.isA(r); } + @Override public void exception(Ice.LocalException ex) { @@ -792,12 +809,14 @@ public class AMI p.begin_ice_ping(new Ice.Callback_Object_ice_ping() { + @Override public void response() { cb.ping(); } + @Override public void exception(Ice.LocalException ex) { @@ -807,12 +826,14 @@ public class AMI cb.check(); p.begin_ice_ping(ctx, new Ice.Callback_Object_ice_ping() { + @Override public void response() { cb.ping(); } + @Override public void exception(Ice.LocalException ex) { @@ -823,12 +844,14 @@ public class AMI p.begin_ice_id(new Ice.Callback_Object_ice_id() { + @Override public void response(String id) { cb.id(id); } + @Override public void exception(Ice.LocalException ex) { @@ -838,12 +861,14 @@ public class AMI cb.check(); p.begin_ice_id(ctx, new Ice.Callback_Object_ice_id() { + @Override public void response(String id) { cb.id(id); } + @Override public void exception(Ice.LocalException ex) { @@ -854,12 +879,14 @@ public class AMI p.begin_ice_ids(new Ice.Callback_Object_ice_ids() { + @Override public void response(String[] ids) { cb.ids(ids); } + @Override public void exception(Ice.LocalException ex) { @@ -869,12 +896,14 @@ public class AMI cb.check(); p.begin_ice_ids(ctx, new Ice.Callback_Object_ice_ids() { + @Override public void response(String[] ids) { cb.ids(ids); } + @Override public void exception(Ice.LocalException ex) { @@ -885,12 +914,14 @@ public class AMI p.begin_op(new Callback_TestIntf_op() { + @Override public void response() { cb.op(); } + @Override public void exception(Ice.LocalException ex) { @@ -900,12 +931,14 @@ public class AMI cb.check(); p.begin_op(ctx, new Callback_TestIntf_op() { + @Override public void response() { cb.op(); } + @Override public void exception(Ice.LocalException ex) { @@ -916,12 +949,14 @@ public class AMI p.begin_opWithResult(new Callback_TestIntf_opWithResult() { + @Override public void response(int r) { cb.opWithResult(r); } + @Override public void exception(Ice.LocalException ex) { @@ -931,12 +966,14 @@ public class AMI cb.check(); p.begin_opWithResult(ctx, new Callback_TestIntf_opWithResult() { + @Override public void response(int r) { cb.opWithResult(r); } + @Override public void exception(Ice.LocalException ex) { @@ -947,18 +984,21 @@ public class AMI p.begin_opWithUE(new Callback_TestIntf_opWithUE() { + @Override public void response() { test(false); } + @Override public void exception(Ice.UserException ex) { cb.opWithUE(ex); } + @Override public void exception(Ice.LocalException ex) { @@ -968,18 +1008,21 @@ public class AMI cb.check(); p.begin_opWithUE(ctx, new Callback_TestIntf_opWithUE() { + @Override public void response() { test(false); } + @Override public void exception(Ice.UserException ex) { cb.opWithUE(ex); } + @Override public void exception(Ice.LocalException ex) { @@ -1046,6 +1089,7 @@ public class AMI i.begin_ice_isA("::Test::TestIntf", new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -1056,6 +1100,7 @@ public class AMI i.begin_ice_ping(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -1066,6 +1111,7 @@ public class AMI i.begin_ice_id(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -1076,6 +1122,7 @@ public class AMI i.begin_ice_ids(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -1086,6 +1133,7 @@ public class AMI i.begin_op(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -1104,12 +1152,14 @@ public class AMI i.begin_ice_isA("::Test::TestIntf", new Ice.Callback_Object_ice_isA() { + @Override public void response(boolean r) { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -1120,12 +1170,14 @@ public class AMI i.begin_ice_ping(new Ice.Callback_Object_ice_ping() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -1136,12 +1188,14 @@ public class AMI i.begin_ice_id(new Ice.Callback_Object_ice_id() { + @Override public void response(String id) { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -1152,12 +1206,14 @@ public class AMI i.begin_ice_ids(new Ice.Callback_Object_ice_ids() { + @Override public void response(String[] ids) { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -1168,12 +1224,14 @@ public class AMI i.begin_op(new Callback_TestIntf_op() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -1191,18 +1249,21 @@ public class AMI p.begin_ice_isA("", new Ice.Callback_Object_ice_isA() { + @Override public void response(boolean r) { cb.isA(r); } + @Override public void exception(Ice.LocalException ex) { cb.ex(ex); } + @Override public void sent(boolean ss) { @@ -1213,18 +1274,21 @@ public class AMI p.begin_ice_ping(new Ice.Callback_Object_ice_ping() { + @Override public void response() { cb.ping(); } + @Override public void exception(Ice.LocalException ex) { cb.ex(ex); } + @Override public void sent(boolean ss) { @@ -1235,18 +1299,21 @@ public class AMI p.begin_ice_id(new Ice.Callback_Object_ice_id() { + @Override public void response(String id) { cb.id(id); } + @Override public void exception(Ice.LocalException ex) { cb.ex(ex); } + @Override public void sent(boolean ss) { @@ -1257,18 +1324,21 @@ public class AMI p.begin_ice_ids(new Ice.Callback_Object_ice_ids() { + @Override public void response(String[] ids) { cb.ids(ids); } + @Override public void exception(Ice.LocalException ex) { cb.ex(ex); } + @Override public void sent(boolean ss) { @@ -1279,18 +1349,21 @@ public class AMI p.begin_op(new Callback_TestIntf_op() { + @Override public void response() { cb.op(); } + @Override public void exception(Ice.LocalException ex) { cb.ex(ex); } + @Override public void sent(boolean ss) { @@ -1301,12 +1374,14 @@ public class AMI p.begin_op(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult result) { cb.opAsync(result); } + @Override public void sent(Ice.AsyncResult result) { @@ -1327,17 +1402,20 @@ public class AMI final SentCallback cb2 = new SentCallback(); r = p.begin_opWithPayload(seq, new Callback_TestIntf_opWithPayload() { + @Override public void response() { } + @Override public void exception(Ice.LocalException ex) { cb2.ex(ex); } + @Override public void sent(boolean ss) { @@ -1426,6 +1504,7 @@ public class AMI p.begin_op(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult result) { @@ -1436,12 +1515,14 @@ public class AMI p.begin_op(new Callback_TestIntf_op() { + @Override public void response() { cb.op(); } + @Override public void exception(Ice.LocalException ex) { @@ -1451,12 +1532,14 @@ public class AMI q.begin_op(new Callback_TestIntf_op() { + @Override public void response() { cb.op(); } + @Override public void exception(Ice.LocalException ex) { @@ -1467,16 +1550,19 @@ public class AMI p.begin_op(new Callback_TestIntf_op() { + @Override public void response() { } + @Override public void exception(Ice.LocalException ex) { } + @Override public void sent(boolean ss) { diff --git a/java/test/Ice/ami/AllTests.java b/java/test/Ice/ami/AllTests.java index 878f946b4a1..8e98a2e7667 100644 --- a/java/test/Ice/ami/AllTests.java +++ b/java/test/Ice/ami/AllTests.java @@ -15,11 +15,6 @@ import test.Ice.ami.Test.TestIntfPrx; import test.Ice.ami.Test.TestIntfPrxHelper; import test.Ice.ami.Test.TestIntfControllerPrx; import test.Ice.ami.Test.TestIntfControllerPrxHelper; -import test.Ice.ami.Test.TestIntfException; -import test.Ice.ami.Test.Callback_TestIntf_op; -import test.Ice.ami.Test.Callback_TestIntf_opWithResult; -import test.Ice.ami.Test.Callback_TestIntf_opWithUE; -import test.Ice.ami.Test.Callback_TestIntf_opWithPayload; import test.Util.Application; public class AllTests diff --git a/java/test/Ice/ami/Client.java b/java/test/Ice/ami/Client.java index 4fb5d0c49a4..e95e0e9bfb6 100644 --- a/java/test/Ice/ami/Client.java +++ b/java/test/Ice/ami/Client.java @@ -11,12 +11,14 @@ package test.Ice.ami; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(this); return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/ami/Collocated.java b/java/test/Ice/ami/Collocated.java index d51620a84f8..765c8944413 100644 --- a/java/test/Ice/ami/Collocated.java +++ b/java/test/Ice/ami/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.ami; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); @@ -25,6 +26,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/ami/Server.java b/java/test/Ice/ami/Server.java index 601cbb71186..c5c732b69de 100644 --- a/java/test/Ice/ami/Server.java +++ b/java/test/Ice/ami/Server.java @@ -11,6 +11,7 @@ package test.Ice.ami; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -25,6 +26,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/ami/TestControllerI.java b/java/test/Ice/ami/TestControllerI.java index abc4d3ec57d..9eebceb7214 100644 --- a/java/test/Ice/ami/TestControllerI.java +++ b/java/test/Ice/ami/TestControllerI.java @@ -12,12 +12,14 @@ import test.Ice.ami.Test._TestIntfControllerDisp; class TestControllerI extends _TestIntfControllerDisp { + @Override public void holdAdapter(Ice.Current current) { _adapter.hold(); } + @Override public void resumeAdapter(Ice.Current current) { diff --git a/java/test/Ice/ami/TestI.java b/java/test/Ice/ami/TestI.java index 912eac7d919..cc4f2a2040d 100644 --- a/java/test/Ice/ami/TestI.java +++ b/java/test/Ice/ami/TestI.java @@ -18,17 +18,20 @@ public class TestI extends _TestIntfDisp { } + @Override public void op(Ice.Current current) { } + @Override public int opWithResult(Ice.Current current) { return 15; } + @Override public void opWithUE(Ice.Current current) throws TestIntfException @@ -36,11 +39,13 @@ public class TestI extends _TestIntfDisp throw new TestIntfException(); } + @Override public void opWithPayload(byte[] seq, Ice.Current current) { } + @Override public synchronized void opBatch(Ice.Current current) { @@ -48,12 +53,14 @@ public class TestI extends _TestIntfDisp notify(); } + @Override public synchronized int opBatchCount(Ice.Current current) { return _batchCount; } + @Override public synchronized boolean waitForBatch(int count, Ice.Current current) { @@ -72,12 +79,14 @@ public class TestI extends _TestIntfDisp return result; } + @Override public void close(boolean force, Ice.Current current) { current.con.close(force); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/background/Acceptor.java b/java/test/Ice/background/Acceptor.java index 02a33c49506..9c9b43231af 100644 --- a/java/test/Ice/background/Acceptor.java +++ b/java/test/Ice/background/Acceptor.java @@ -11,36 +11,42 @@ package test.Ice.background; class Acceptor implements IceInternal.Acceptor { + @Override public java.nio.channels.ServerSocketChannel fd() { return _acceptor.fd(); } + @Override public void close() { _acceptor.close(); } + @Override public void listen() { _acceptor.listen(); } + @Override public IceInternal.Transceiver accept() { return new Transceiver(_configuration, _acceptor.accept()); } + @Override public String protocol() { return _acceptor.protocol(); } + @Override public String toString() { diff --git a/java/test/Ice/background/AllTests.java b/java/test/Ice/background/AllTests.java index e029f2a8056..ba04e6421b7 100644 --- a/java/test/Ice/background/AllTests.java +++ b/java/test/Ice/background/AllTests.java @@ -8,7 +8,6 @@ // ********************************************************************** package test.Ice.background; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.background.Test.BackgroundControllerPrx; @@ -142,12 +141,6 @@ public class AllTests } } - public void responseAndSent() - { - _sent.check(); - _response.check(); - } - private Callback _response = new Callback(); private Callback _sent = new Callback(); } @@ -223,6 +216,7 @@ public class AllTests start(); } + @Override public void run() { diff --git a/java/test/Ice/background/BackgroundControllerI.java b/java/test/Ice/background/BackgroundControllerI.java index 64cefee73ca..fb1a591e193 100644 --- a/java/test/Ice/background/BackgroundControllerI.java +++ b/java/test/Ice/background/BackgroundControllerI.java @@ -12,12 +12,14 @@ import test.Ice.background.Test._BackgroundControllerDisp; class BackgroundControllerI extends _BackgroundControllerDisp { + @Override synchronized public void pauseCall(String opName, Ice.Current current) { _pausedCalls.add(opName); } + @Override synchronized public void resumeCall(String opName, Ice.Current current) { @@ -41,54 +43,63 @@ class BackgroundControllerI extends _BackgroundControllerDisp } } + @Override public void holdAdapter(Ice.Current current) { _adapter.hold(); } + @Override public void resumeAdapter(Ice.Current current) { _adapter.activate(); } + @Override public void initializeSocketStatus(int status, Ice.Current current) { _configuration.initializeSocketStatus(status); } + @Override public void initializeException(boolean enable, Ice.Current current) { _configuration.initializeException(enable ? new Ice.SocketException() : null); } + @Override public void readReady(boolean enable, Ice.Current current) { _configuration.readReady(enable); } + @Override public void readException(boolean enable, Ice.Current current) { _configuration.readException(enable ? new Ice.SocketException() : null); } + @Override public void writeReady(boolean enable, Ice.Current current) { _configuration.writeReady(enable); } + @Override public void writeException(boolean enable, Ice.Current current) { _configuration.writeException(enable ? new Ice.SocketException() : null); } + @Override public void buffered(boolean enable, Ice.Current current) { diff --git a/java/test/Ice/background/BackgroundI.java b/java/test/Ice/background/BackgroundI.java index e6e8b70add2..57adf958ca5 100644 --- a/java/test/Ice/background/BackgroundI.java +++ b/java/test/Ice/background/BackgroundI.java @@ -12,18 +12,21 @@ import test.Ice.background.Test._BackgroundDisp; class BackgroundI extends _BackgroundDisp { + @Override public void op(Ice.Current current) { _controller.checkCallPause(current); } + @Override public void opWithPayload(byte[] seq, Ice.Current current) { _controller.checkCallPause(current); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/background/Client.java b/java/test/Ice/background/Client.java index fd7df429b42..1955472ebab 100644 --- a/java/test/Ice/background/Client.java +++ b/java/test/Ice/background/Client.java @@ -13,6 +13,7 @@ import test.Ice.background.Test.BackgroundPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { @@ -26,6 +27,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/background/Collocated.java b/java/test/Ice/background/Collocated.java index 0c468a0d65c..ac3e4622f17 100644 --- a/java/test/Ice/background/Collocated.java +++ b/java/test/Ice/background/Collocated.java @@ -20,6 +20,7 @@ public class Collocated final Server server = new Server(); Thread t = new Thread(new Runnable() { + @Override public void run() { String[] args = @@ -35,10 +36,12 @@ public class Collocated }; server.setServerReadyListener(new test.Util.Application.ServerReadyListener() { + @Override public void serverReady() { _clientThread = new Thread(new Runnable() { + @Override public void run() { String[] args = diff --git a/java/test/Ice/background/Connector.java b/java/test/Ice/background/Connector.java index 22e5d9e7edb..afc3db49abe 100644 --- a/java/test/Ice/background/Connector.java +++ b/java/test/Ice/background/Connector.java @@ -10,6 +10,7 @@ package test.Ice.background; final class Connector implements IceInternal.Connector { + @Override public IceInternal.Transceiver connect() { @@ -17,18 +18,21 @@ final class Connector implements IceInternal.Connector return new Transceiver(_configuration, _connector.connect()); } + @Override public short type() { return (short)(EndpointI.TYPE_BASE + _connector.type()); } + @Override public String toString() { return _connector.toString(); } + @Override public int hashCode() { @@ -44,6 +48,7 @@ final class Connector implements IceInternal.Connector _connector = connector; } + @Override public boolean equals(java.lang.Object obj) { diff --git a/java/test/Ice/background/EndpointFactory.java b/java/test/Ice/background/EndpointFactory.java index 55aba553082..09a8f35290b 100644 --- a/java/test/Ice/background/EndpointFactory.java +++ b/java/test/Ice/background/EndpointFactory.java @@ -16,24 +16,28 @@ final class EndpointFactory implements IceInternal.EndpointFactory _factory = factory; } + @Override public short type() { return (short)(EndpointI.TYPE_BASE + _factory.type()); } + @Override public String protocol() { return "test-" + _factory.protocol(); } + @Override public IceInternal.EndpointI create(java.util.ArrayList<String> args, boolean server) { return new EndpointI(_configuration, _factory.create(args, server)); } + @Override public IceInternal.EndpointI read(IceInternal.BasicStream s) { @@ -46,11 +50,13 @@ final class EndpointFactory implements IceInternal.EndpointFactory return endpoint; } + @Override public void destroy() { } + @Override public IceInternal.EndpointFactory clone(IceInternal.ProtocolInstance instance) { diff --git a/java/test/Ice/background/EndpointI.java b/java/test/Ice/background/EndpointI.java index d364e0b32a8..c670ed30feb 100644 --- a/java/test/Ice/background/EndpointI.java +++ b/java/test/Ice/background/EndpointI.java @@ -19,18 +19,21 @@ final class EndpointI extends IceInternal.EndpointI _configuration = configuration; } + @Override public String _toString() { return "test-" + _endpoint.toString(); } + @Override public Ice.EndpointInfo getInfo() { return _endpoint.getInfo(); } + @Override public void streamWrite(IceInternal.BasicStream s) { @@ -40,24 +43,28 @@ final class EndpointI extends IceInternal.EndpointI s.endWriteEncaps(); } + @Override public short type() { return (short)(TYPE_BASE + _endpoint.type()); } + @Override public String protocol() { return _endpoint.protocol(); } + @Override public int timeout() { return _endpoint.timeout(); } + @Override public IceInternal.EndpointI timeout(int timeout) { @@ -72,12 +79,14 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public String connectionId() { return _endpoint.connectionId(); } + @Override public IceInternal.EndpointI connectionId(String connectionId) { @@ -92,12 +101,14 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public boolean compress() { return _endpoint.compress(); } + @Override public IceInternal.EndpointI compress(boolean compress) { @@ -112,18 +123,21 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public boolean datagram() { return _endpoint.datagram(); } + @Override public boolean secure() { return _endpoint.secure(); } + @Override public IceInternal.Transceiver transceiver(IceInternal.EndpointIHolder endpoint) { @@ -147,6 +161,7 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public java.util.List<IceInternal.Connector> connectors(Ice.EndpointSelectionType selType) { @@ -159,11 +174,13 @@ final class EndpointI extends IceInternal.EndpointI return connectors; } + @Override public void connectors_async(Ice.EndpointSelectionType selType, final IceInternal.EndpointI_connectors cb) { class Callback implements IceInternal.EndpointI_connectors { + @Override public void connectors(java.util.List<IceInternal.Connector> cons) { @@ -175,6 +192,7 @@ final class EndpointI extends IceInternal.EndpointI cb.connectors(connectors); } + @Override public void exception(Ice.LocalException exception) { @@ -193,6 +211,7 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public IceInternal.Acceptor acceptor(IceInternal.EndpointIHolder endpoint, String adapterName) { @@ -201,6 +220,7 @@ final class EndpointI extends IceInternal.EndpointI return p; } + @Override public java.util.List<IceInternal.EndpointI> expand() { @@ -212,6 +232,7 @@ final class EndpointI extends IceInternal.EndpointI return endps; } + @Override public boolean equivalent(IceInternal.EndpointI endpoint) { @@ -227,12 +248,14 @@ final class EndpointI extends IceInternal.EndpointI return testEndpoint._endpoint.equivalent(_endpoint); } + @Override public String options() { return _endpoint.options(); } + @Override public int hashCode() { @@ -242,6 +265,7 @@ final class EndpointI extends IceInternal.EndpointI // // Compare endpoints for sorting purposes // + @Override public boolean equals(java.lang.Object obj) { @@ -256,6 +280,7 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public int compareTo(IceInternal.EndpointI obj) // From java.lang.Comparable { diff --git a/java/test/Ice/background/PluginFactory.java b/java/test/Ice/background/PluginFactory.java index 9d39830bc0f..9edd6c8fa38 100644 --- a/java/test/Ice/background/PluginFactory.java +++ b/java/test/Ice/background/PluginFactory.java @@ -19,6 +19,7 @@ public class PluginFactory implements Ice.PluginFactory _communicator = communicator; } + @Override public void initialize() { @@ -34,6 +35,7 @@ public class PluginFactory implements Ice.PluginFactory } } + @Override public void destroy() { @@ -49,6 +51,7 @@ public class PluginFactory implements Ice.PluginFactory private Configuration _configuration; } + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { diff --git a/java/test/Ice/background/Server.java b/java/test/Ice/background/Server.java index d9b3ddad18a..52aaf1f1f49 100644 --- a/java/test/Ice/background/Server.java +++ b/java/test/Ice/background/Server.java @@ -14,6 +14,7 @@ public class Server extends test.Util.Application { static public class LocatorI extends Ice._LocatorDisp { + @Override public void findAdapterById_async(Ice.AMD_Locator_findAdapterById response, String adapter, Ice.Current current) throws Ice.AdapterNotFoundException @@ -23,6 +24,7 @@ public class Server extends test.Util.Application response.ice_response(current.adapter.createDirectProxy(communicator.stringToIdentity("dummy"))); } + @Override public void findObjectById_async(Ice.AMD_Locator_findObjectById response, Ice.Identity id, Ice.Current current) throws Ice.ObjectNotFoundException @@ -31,6 +33,7 @@ public class Server extends test.Util.Application response.ice_response(current.adapter.createDirectProxy(id)); } + @Override public Ice.LocatorRegistryPrx getRegistry(Ice.Current current) { @@ -47,6 +50,7 @@ public class Server extends test.Util.Application static public class RouterI extends Ice._RouterDisp { + @Override public Ice.ObjectPrx getClientProxy(Ice.Current current) { @@ -54,6 +58,7 @@ public class Server extends test.Util.Application return null; } + @Override public Ice.ObjectPrx getServerProxy(Ice.Current current) { @@ -64,11 +69,14 @@ public class Server extends test.Util.Application /** * @deprecated addProxy() is deprecated, use addProxies() instead. **/ + @Deprecated + @Override public void addProxy(Ice.ObjectPrx proxy, Ice.Current current) { } + @Override public Ice.ObjectPrx[] addProxies(Ice.ObjectPrx[] proxies, Ice.Current current) { @@ -83,6 +91,7 @@ public class Server extends test.Util.Application final private BackgroundControllerI _controller; } + @Override public int run(String[] args) { @@ -107,6 +116,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/background/Transceiver.java b/java/test/Ice/background/Transceiver.java index cc176b6a80b..81359113c41 100644 --- a/java/test/Ice/background/Transceiver.java +++ b/java/test/Ice/background/Transceiver.java @@ -11,12 +11,14 @@ package test.Ice.background; final class Transceiver implements IceInternal.Transceiver { + @Override public java.nio.channels.SelectableChannel fd() { return _transceiver.fd(); } + @Override public int initialize(IceInternal.Buffer readBuffer, IceInternal.Buffer writeBuffer, Ice.Holder<Boolean> moreData) { @@ -56,18 +58,21 @@ final class Transceiver implements IceInternal.Transceiver return IceInternal.SocketOperation.None; } + @Override public int closing(boolean initiator, Ice.LocalException ex) { return _transceiver.closing(initiator, ex); } + @Override public void close() { _transceiver.close(); } + @Override public int write(IceInternal.Buffer buf) { @@ -80,6 +85,7 @@ final class Transceiver implements IceInternal.Transceiver return _transceiver.write(buf); } + @Override public int read(IceInternal.Buffer buf, Ice.Holder<Boolean> moreData) { @@ -131,24 +137,28 @@ final class Transceiver implements IceInternal.Transceiver } } + @Override public String protocol() { return "test-" + _transceiver.protocol(); } + @Override public String toString() { return _transceiver.toString(); } + @Override public Ice.ConnectionInfo getInfo() { return _transceiver.getInfo(); } + @Override public void checkSendSize(IceInternal.Buffer buf, int messageSizeMax) { diff --git a/java/test/Ice/binding/AllTests.java b/java/test/Ice/binding/AllTests.java index 006f118460e..88aa196b157 100644 --- a/java/test/Ice/binding/AllTests.java +++ b/java/test/Ice/binding/AllTests.java @@ -16,7 +16,6 @@ import test.Ice.binding.Test.RemoteCommunicatorPrxHelper; import test.Ice.binding.Test.RemoteObjectAdapterPrx; import test.Ice.binding.Test.TestIntfPrx; import test.Ice.binding.Test.TestIntfPrxHelper; -import test.Ice.binding.Test.Callback_TestIntf_getAdapterName; public class AllTests { @@ -31,6 +30,7 @@ public class AllTests static class GetAdapterNameCB extends Ice.Callback { + @Override synchronized public void completed(Ice.AsyncResult result) { @@ -84,7 +84,7 @@ public class AllTests endpoints.addAll(java.util.Arrays.asList(edpts)); } return TestIntfPrxHelper.uncheckedCast( - test.ice_endpoints((Ice.Endpoint[])endpoints.toArray(new Ice.Endpoint[endpoints.size()]))); + test.ice_endpoints(endpoints.toArray(new Ice.Endpoint[endpoints.size()]))); } private static void diff --git a/java/test/Ice/binding/Client.java b/java/test/Ice/binding/Client.java index 4a12d29f628..30d087baac3 100644 --- a/java/test/Ice/binding/Client.java +++ b/java/test/Ice/binding/Client.java @@ -11,12 +11,14 @@ package test.Ice.binding; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(communicator(), getWriter()); return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/binding/RemoteCommunicatorI.java b/java/test/Ice/binding/RemoteCommunicatorI.java index 8eccc8449ee..fbebb72cd59 100644 --- a/java/test/Ice/binding/RemoteCommunicatorI.java +++ b/java/test/Ice/binding/RemoteCommunicatorI.java @@ -13,6 +13,7 @@ import test.Ice.binding.Test._RemoteCommunicatorDisp; public class RemoteCommunicatorI extends _RemoteCommunicatorDisp { + @Override public RemoteObjectAdapterPrx createObjectAdapter(String name, String endpts, Ice.Current current) { @@ -30,12 +31,14 @@ public class RemoteCommunicatorI extends _RemoteCommunicatorDisp current.adapter.addWithUUID(new RemoteObjectAdapterI(adapter))); } + @Override public void deactivateObjectAdapter(RemoteObjectAdapterPrx adapter, Ice.Current current) { adapter.deactivate(); // Collocated call. } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/binding/RemoteObjectAdapterI.java b/java/test/Ice/binding/RemoteObjectAdapterI.java index 2a2aae7a56d..a8b22ec5197 100644 --- a/java/test/Ice/binding/RemoteObjectAdapterI.java +++ b/java/test/Ice/binding/RemoteObjectAdapterI.java @@ -24,12 +24,14 @@ public class RemoteObjectAdapterI extends _RemoteObjectAdapterDisp _adapter.activate(); } + @Override public TestIntfPrx getTestIntf(Ice.Current current) { return _testIntf; } + @Override public void deactivate(Ice.Current current) { diff --git a/java/test/Ice/binding/Server.java b/java/test/Ice/binding/Server.java index 1aa01bc58da..9c2926cdc3b 100644 --- a/java/test/Ice/binding/Server.java +++ b/java/test/Ice/binding/Server.java @@ -11,6 +11,7 @@ package test.Ice.binding; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -23,6 +24,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/binding/TestI.java b/java/test/Ice/binding/TestI.java index 40556d06761..23a13b96ff8 100644 --- a/java/test/Ice/binding/TestI.java +++ b/java/test/Ice/binding/TestI.java @@ -16,6 +16,7 @@ public class TestI extends _TestIntfDisp { } + @Override public String getAdapterName(Ice.Current current) { diff --git a/java/test/Ice/checksum/AllTests.java b/java/test/Ice/checksum/AllTests.java index 221381e51d8..3fb2c711746 100644 --- a/java/test/Ice/checksum/AllTests.java +++ b/java/test/Ice/checksum/AllTests.java @@ -73,7 +73,7 @@ public class AllTests } } - String value = (String)SliceChecksums.checksums.get(key); + String value = SliceChecksums.checksums.get(key); test(value != null); if(n <= 1) diff --git a/java/test/Ice/checksum/ChecksumI.java b/java/test/Ice/checksum/ChecksumI.java index cd591fe4e69..a85707f400e 100644 --- a/java/test/Ice/checksum/ChecksumI.java +++ b/java/test/Ice/checksum/ChecksumI.java @@ -18,12 +18,14 @@ public final class ChecksumI extends _ChecksumDisp { } + @Override public java.util.Map<String, String> getSliceChecksums(Ice.Current current) { return SliceChecksums.checksums; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/checksum/Client.java b/java/test/Ice/checksum/Client.java index d4d1db9549b..34d4f3ab1b8 100644 --- a/java/test/Ice/checksum/Client.java +++ b/java/test/Ice/checksum/Client.java @@ -13,6 +13,7 @@ import test.Ice.checksum.Test.ChecksumPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { @@ -23,6 +24,7 @@ public class Client extends test.Util.Application } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/checksum/Server.java b/java/test/Ice/checksum/Server.java index b0e76a1ed44..c64042283e4 100644 --- a/java/test/Ice/checksum/Server.java +++ b/java/test/Ice/checksum/Server.java @@ -11,6 +11,7 @@ package test.Ice.checksum; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -23,6 +24,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/classLoader/AbstractClassI.java b/java/test/Ice/classLoader/AbstractClassI.java index db3b9b347f3..df7bcf8a4c4 100644 --- a/java/test/Ice/classLoader/AbstractClassI.java +++ b/java/test/Ice/classLoader/AbstractClassI.java @@ -13,6 +13,7 @@ import test.Ice.classLoader.Test.AbstractClass; class AbstractClassI extends AbstractClass { + @Override public void op(Ice.Current current) { diff --git a/java/test/Ice/classLoader/AllTests.java b/java/test/Ice/classLoader/AllTests.java index f5d127be9c2..d0181cff1a6 100644 --- a/java/test/Ice/classLoader/AllTests.java +++ b/java/test/Ice/classLoader/AllTests.java @@ -22,6 +22,7 @@ public class AllTests { private static class MyObjectFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { if(type.equals("::Test::AbstractClass")) @@ -33,6 +34,7 @@ public class AllTests return null; } + @Override public void destroy() { // Nothing to do @@ -41,6 +43,7 @@ public class AllTests private static class MyClassLoader extends ClassLoader { + @Override protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { diff --git a/java/test/Ice/classLoader/CertificateVerifierI.java b/java/test/Ice/classLoader/CertificateVerifierI.java index ada4f00e86b..3e681297f84 100644 --- a/java/test/Ice/classLoader/CertificateVerifierI.java +++ b/java/test/Ice/classLoader/CertificateVerifierI.java @@ -11,6 +11,7 @@ package test.Ice.classLoader; public class CertificateVerifierI implements IceSSL.CertificateVerifier { + @Override public boolean verify(IceSSL.NativeConnectionInfo info) { return true; diff --git a/java/test/Ice/classLoader/Client.java b/java/test/Ice/classLoader/Client.java index 33384192655..20152d6b598 100644 --- a/java/test/Ice/classLoader/Client.java +++ b/java/test/Ice/classLoader/Client.java @@ -11,12 +11,14 @@ package test.Ice.classLoader; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(this, false); return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { _initData = new Ice.InitializationData(); diff --git a/java/test/Ice/classLoader/InitialI.java b/java/test/Ice/classLoader/InitialI.java index d8e2ddf44d8..a8056715aad 100644 --- a/java/test/Ice/classLoader/InitialI.java +++ b/java/test/Ice/classLoader/InitialI.java @@ -22,18 +22,21 @@ public final class InitialI extends _InitialDisp _adapter = adapter; } + @Override public ConcreteClass getConcreteClass(Ice.Current current) { return new ConcreteClass(); } + @Override public AbstractClass getAbstractClass(Ice.Current current) { return new AbstractClassI(); } + @Override public void throwException(Ice.Current current) throws E @@ -41,6 +44,7 @@ public final class InitialI extends _InitialDisp throw new E(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/classLoader/PasswordCallbackI.java b/java/test/Ice/classLoader/PasswordCallbackI.java index 2312fb390a9..e5eba1462dd 100644 --- a/java/test/Ice/classLoader/PasswordCallbackI.java +++ b/java/test/Ice/classLoader/PasswordCallbackI.java @@ -11,16 +11,19 @@ package test.Ice.classLoader; public class PasswordCallbackI implements IceSSL.PasswordCallback { + @Override public char[] getPassword(String alias) { return "password".toCharArray(); } + @Override public char[] getTruststorePassword() { return "password".toCharArray(); } + @Override public char[] getKeystorePassword() { return "password".toCharArray(); diff --git a/java/test/Ice/classLoader/PluginFactoryI.java b/java/test/Ice/classLoader/PluginFactoryI.java index 6f672614ca5..2416e04c420 100644 --- a/java/test/Ice/classLoader/PluginFactoryI.java +++ b/java/test/Ice/classLoader/PluginFactoryI.java @@ -13,15 +13,18 @@ public class PluginFactoryI implements Ice.PluginFactory { static class PluginI implements Ice.Plugin { + @Override public void initialize() { } + @Override public void destroy() { } } + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginI(); diff --git a/java/test/Ice/classLoader/Server.java b/java/test/Ice/classLoader/Server.java index e8499a15f86..79abca86364 100644 --- a/java/test/Ice/classLoader/Server.java +++ b/java/test/Ice/classLoader/Server.java @@ -11,6 +11,7 @@ package test.Ice.classLoader; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -22,6 +23,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/custom/Client.java b/java/test/Ice/custom/Client.java index a3159d17c77..da5808ca6a5 100644 --- a/java/test/Ice/custom/Client.java +++ b/java/test/Ice/custom/Client.java @@ -13,6 +13,7 @@ import test.Ice.custom.Test.TestIntfPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/custom/Collocated.java b/java/test/Ice/custom/Collocated.java index 0d130a24321..a770a6af49b 100644 --- a/java/test/Ice/custom/Collocated.java +++ b/java/test/Ice/custom/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.custom; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -23,6 +24,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/custom/Server.java b/java/test/Ice/custom/Server.java index 2c6060c24aa..f7e76de4050 100644 --- a/java/test/Ice/custom/Server.java +++ b/java/test/Ice/custom/Server.java @@ -11,6 +11,7 @@ package test.Ice.custom; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -23,6 +24,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/custom/TestI.java b/java/test/Ice/custom/TestI.java index c3f3d47e85f..5392561c044 100644 --- a/java/test/Ice/custom/TestI.java +++ b/java/test/Ice/custom/TestI.java @@ -42,6 +42,7 @@ public final class TestI extends TestIntf _communicator = communicator; } + @Override public List<C> opCArray(List<C> inSeq, CArrayHolder outSeq, Ice.Current current) { @@ -49,6 +50,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<C> opCList(List<C> inSeq, CListHolder outSeq, Ice.Current current) { @@ -56,6 +58,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public C[] opCSeq(C[] inSeq, CSeqHolder outSeq, Ice.Current current) { @@ -65,6 +68,7 @@ public final class TestI extends TestIntf return outSeq.value; } + @Override public List<Boolean> opBoolSeq(List<Boolean> inSeq, BoolSeqHolder outSeq, Ice.Current current) { @@ -72,6 +76,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Byte> opByteSeq(List<Byte> inSeq, ByteSeqHolder outSeq, Ice.Current current) { @@ -79,6 +84,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Map<Integer,String>> opDSeq(List<Map<Integer,String>> inSeq, DSeqHolder outSeq, Ice.Current current) { @@ -86,6 +92,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Double> opDoubleSeq(List<Double> inSeq, DoubleSeqHolder outSeq, Ice.Current current) { @@ -93,6 +100,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<E> opESeq(List<E> inSeq, ESeqHolder outSeq, Ice.Current current) { @@ -100,6 +108,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Float> opFloatSeq(List<Float> inSeq, FloatSeqHolder outSeq, Ice.Current current) { @@ -107,6 +116,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Integer> opIntSeq(List<Integer> inSeq, IntSeqHolder outSeq, Ice.Current current) { @@ -114,6 +124,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Long> opLongSeq(List<Long> inSeq, LongSeqHolder outSeq, Ice.Current current) { @@ -121,6 +132,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<S> opSSeq(List<S> inSeq, SSeqHolder outSeq, Ice.Current current) { @@ -128,6 +140,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Short> opShortSeq(List<Short> inSeq, ShortSeqHolder outSeq, Ice.Current current) { @@ -135,6 +148,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<String> opStringSeq(List<String> inSeq, StringSeqHolder outSeq, Ice.Current current) { @@ -142,6 +156,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<List<String>> opStringSeqSeq(List<List<String>> inSeq, StringSeqSeqHolder outSeq, Ice.Current current) { @@ -149,6 +164,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/defaultServant/AllTests.java b/java/test/Ice/defaultServant/AllTests.java index e68a38e42c7..50589050baf 100644 --- a/java/test/Ice/defaultServant/AllTests.java +++ b/java/test/Ice/defaultServant/AllTests.java @@ -30,7 +30,7 @@ public class AllTests Ice.ObjectAdapter oa = communicator.createObjectAdapterWithEndpoints("MyOA", "tcp -h localhost"); oa.activate(); - Ice.Object servant = (Ice.Object)new MyObjectI(); + Ice.Object servant = new MyObjectI(); // // Register default servant with category "foo" diff --git a/java/test/Ice/defaultServant/Client.java b/java/test/Ice/defaultServant/Client.java index f1c01ea801b..4f9b3be9ec4 100644 --- a/java/test/Ice/defaultServant/Client.java +++ b/java/test/Ice/defaultServant/Client.java @@ -11,6 +11,7 @@ package test.Ice.defaultServant; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(this, getWriter()); diff --git a/java/test/Ice/defaultServant/MyObjectI.java b/java/test/Ice/defaultServant/MyObjectI.java index c9a0cef7e93..64d4548f920 100644 --- a/java/test/Ice/defaultServant/MyObjectI.java +++ b/java/test/Ice/defaultServant/MyObjectI.java @@ -12,6 +12,7 @@ import test.Ice.defaultServant.Test.*; public final class MyObjectI extends _MyObjectDisp { + @Override public void ice_ping(Ice.Current current) { @@ -27,6 +28,7 @@ public final class MyObjectI extends _MyObjectDisp } } + @Override public String getName(Ice.Current current) { diff --git a/java/test/Ice/defaultValue/Client.java b/java/test/Ice/defaultValue/Client.java index 8f08a585eeb..78685aa1939 100644 --- a/java/test/Ice/defaultValue/Client.java +++ b/java/test/Ice/defaultValue/Client.java @@ -11,6 +11,7 @@ package test.Ice.defaultValue; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(this, getWriter()); diff --git a/java/test/Ice/dispatcher/AllTests.java b/java/test/Ice/dispatcher/AllTests.java index 843b93d70b4..e1badc24a9a 100644 --- a/java/test/Ice/dispatcher/AllTests.java +++ b/java/test/Ice/dispatcher/AllTests.java @@ -91,6 +91,7 @@ public class AllTests OpCallback cb = new OpCallback() { + @Override public void response() { @@ -98,6 +99,7 @@ public class AllTests called(); } + @Override public void exception(Ice.LocalException ex) { @@ -111,12 +113,14 @@ public class AllTests TestIntfPrx i = (TestIntfPrx)p.ice_adapterId("dummy"); cb = new OpCallback() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -135,12 +139,14 @@ public class AllTests TestIntfPrx to = TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(250)); class Callback_TestIntf_sleepImpl extends Callback_TestIntf_sleep { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -149,6 +155,7 @@ public class AllTests called(); } + @Override public void sent(boolean sentSynchronously) { @@ -186,18 +193,21 @@ public class AllTests testController.holdAdapter(); Callback_TestIntf_opWithPayload callback = new Callback_TestIntf_opWithPayload() { + @Override public void response() { test(dispatcher.isDispatcherThread()); } + @Override public void exception(Ice.LocalException ex) { test(ex instanceof Ice.CommunicatorDestroyedException); } + @Override public void sent(boolean sentSynchronously) { diff --git a/java/test/Ice/dispatcher/Client.java b/java/test/Ice/dispatcher/Client.java index 483eb703906..9b490d763c1 100644 --- a/java/test/Ice/dispatcher/Client.java +++ b/java/test/Ice/dispatcher/Client.java @@ -11,12 +11,14 @@ package test.Ice.dispatcher; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(communicator(), getWriter(), _dispatcher); return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { assert(_dispatcher == null); diff --git a/java/test/Ice/dispatcher/Collocated.java b/java/test/Ice/dispatcher/Collocated.java index 6a856c75375..453311a3584 100644 --- a/java/test/Ice/dispatcher/Collocated.java +++ b/java/test/Ice/dispatcher/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.dispatcher; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); @@ -26,6 +27,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { assert(_dispatcher == null); diff --git a/java/test/Ice/dispatcher/Dispatcher.java b/java/test/Ice/dispatcher/Dispatcher.java index fef7a4a1e38..2ee5dbb6f4d 100644 --- a/java/test/Ice/dispatcher/Dispatcher.java +++ b/java/test/Ice/dispatcher/Dispatcher.java @@ -26,6 +26,7 @@ public class Dispatcher implements Runnable, Ice.Dispatcher _thread.start(); } + @Override public void run() { @@ -71,6 +72,7 @@ public class Dispatcher implements Runnable, Ice.Dispatcher } } + @Override synchronized public void dispatch(Runnable call, Ice.Connection con) { diff --git a/java/test/Ice/dispatcher/Server.java b/java/test/Ice/dispatcher/Server.java index 408da37a650..c4ef87e7451 100644 --- a/java/test/Ice/dispatcher/Server.java +++ b/java/test/Ice/dispatcher/Server.java @@ -11,11 +11,10 @@ package test.Ice.dispatcher; public class Server extends test.Util.Application { + @Override public int run(String[] args) { - Ice.Communicator communicator = communicator(); - Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); @@ -28,6 +27,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { assert(_dispatcher == null); diff --git a/java/test/Ice/dispatcher/TestControllerI.java b/java/test/Ice/dispatcher/TestControllerI.java index 03b0ae23424..cd24a7982b3 100644 --- a/java/test/Ice/dispatcher/TestControllerI.java +++ b/java/test/Ice/dispatcher/TestControllerI.java @@ -13,12 +13,14 @@ import test.Ice.dispatcher.Test._TestIntfControllerDisp; class TestControllerI extends _TestIntfControllerDisp { + @Override public void holdAdapter(Ice.Current current) { _adapter.hold(); } + @Override public void resumeAdapter(Ice.Current current) { diff --git a/java/test/Ice/dispatcher/TestI.java b/java/test/Ice/dispatcher/TestI.java index a3e0e717e88..93dd8513ecc 100644 --- a/java/test/Ice/dispatcher/TestI.java +++ b/java/test/Ice/dispatcher/TestI.java @@ -27,30 +27,35 @@ public class TestI extends _TestIntfDisp _dispatcher = dispatcher; } + @Override public void op(Ice.Current current) { test(_dispatcher.isDispatcherThread()); } + @Override public void sleep(int to, Ice.Current current) { try { - Thread.currentThread().sleep(to); + Thread.currentThread(); + Thread.sleep(to); } catch(InterruptedException ex) { } } + @Override public void opWithPayload(byte[] seq, Ice.Current current) { test(_dispatcher.isDispatcherThread()); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/echo/BlobjectI.java b/java/test/Ice/echo/BlobjectI.java index 3704dcddff1..946284608c1 100644 --- a/java/test/Ice/echo/BlobjectI.java +++ b/java/test/Ice/echo/BlobjectI.java @@ -19,16 +19,19 @@ public class BlobjectI extends Ice.BlobjectAsync _twoway = twoway; } + @Override public void response(boolean ok, byte[] encaps) { _cb.ice_response(ok, encaps); } + @Override public void exception(Ice.LocalException ex) { _cb.ice_exception(ex); } + @Override public void sent(boolean sync) { if(!_twoway) @@ -54,6 +57,7 @@ public class BlobjectI extends Ice.BlobjectAsync _batchProxy = null; } + @Override public void ice_invoke_async(Ice.AMD_Object_ice_invoke amdCb, byte[] inEncaps, Ice.Current current) { diff --git a/java/test/Ice/echo/Server.java b/java/test/Ice/echo/Server.java index 4ba0968d47f..88daf466e01 100644 --- a/java/test/Ice/echo/Server.java +++ b/java/test/Ice/echo/Server.java @@ -18,16 +18,19 @@ public class Server extends test.Util.Application _blob = blob; } + @Override public void startBatch(Ice.Current current) { _blob.startBatch(); } + @Override public void flushBatch(Ice.Current current) { _blob.flushBatch(); } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); @@ -36,6 +39,7 @@ public class Server extends test.Util.Application final private BlobjectI _blob; }; + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); @@ -47,6 +51,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/enums/Client.java b/java/test/Ice/enums/Client.java index ef746a09ee3..f27ee458960 100644 --- a/java/test/Ice/enums/Client.java +++ b/java/test/Ice/enums/Client.java @@ -13,6 +13,7 @@ import test.Ice.enums.Test.TestIntfPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/enums/Server.java b/java/test/Ice/enums/Server.java index 113a5c591f5..24ef6d00730 100644 --- a/java/test/Ice/enums/Server.java +++ b/java/test/Ice/enums/Server.java @@ -11,6 +11,7 @@ package test.Ice.enums; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -23,6 +24,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/enums/TestIntfI.java b/java/test/Ice/enums/TestIntfI.java index d8f05a5ffcd..cbb511e7edd 100644 --- a/java/test/Ice/enums/TestIntfI.java +++ b/java/test/Ice/enums/TestIntfI.java @@ -13,6 +13,7 @@ import test.Ice.enums.Test.*; public final class TestIntfI extends _TestIntfDisp { + @Override public ByteEnum opByte(ByteEnum b1, ByteEnumHolder b2, Ice.Current current) { @@ -20,6 +21,7 @@ public final class TestIntfI extends _TestIntfDisp return b1; } + @Override public ShortEnum opShort(ShortEnum s1, ShortEnumHolder s2, Ice.Current current) { @@ -27,6 +29,7 @@ public final class TestIntfI extends _TestIntfDisp return s1; } + @Override public IntEnum opInt(IntEnum i1, IntEnumHolder i2, Ice.Current current) { @@ -34,6 +37,7 @@ public final class TestIntfI extends _TestIntfDisp return i1; } + @Override public SimpleEnum opSimple(SimpleEnum s1, SimpleEnumHolder s2, Ice.Current current) { @@ -41,6 +45,7 @@ public final class TestIntfI extends _TestIntfDisp return s1; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/exceptions/AMDServer.java b/java/test/Ice/exceptions/AMDServer.java index 10a4375ea9e..a4502cf0080 100644 --- a/java/test/Ice/exceptions/AMDServer.java +++ b/java/test/Ice/exceptions/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.exceptions; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/exceptions/AMDThrowerI.java b/java/test/Ice/exceptions/AMDThrowerI.java index 58a6d626918..bd1013bd589 100644 --- a/java/test/Ice/exceptions/AMDThrowerI.java +++ b/java/test/Ice/exceptions/AMDThrowerI.java @@ -42,6 +42,7 @@ public final class AMDThrowerI extends _ThrowerDisp { } + @Override public void shutdown_async(AMD_Thrower_shutdown cb, Ice.Current current) { @@ -49,18 +50,21 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_response(); } + @Override public void supportsUndeclaredExceptions_async(AMD_Thrower_supportsUndeclaredExceptions cb, Ice.Current current) { cb.ice_response(true); } + @Override public void supportsAssertException_async(AMD_Thrower_supportsAssertException cb, Ice.Current current) { cb.ice_response(true); } + @Override public void throwAasA_async(AMD_Thrower_throwAasA cb, int a, Ice.Current current) throws A @@ -70,6 +74,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwAorDasAorD_async(AMD_Thrower_throwAorDasAorD cb, int a, Ice.Current current) throws A, @@ -89,6 +94,7 @@ public final class AMDThrowerI extends _ThrowerDisp } } + @Override public void throwBasA_async(AMD_Thrower_throwBasA cb, int a, int b, Ice.Current current) throws A @@ -100,6 +106,7 @@ public final class AMDThrowerI extends _ThrowerDisp //cb.ice_exception(ex); } + @Override public void throwBasB_async(AMD_Thrower_throwBasB cb, int a, int b, Ice.Current current) throws B @@ -111,6 +118,7 @@ public final class AMDThrowerI extends _ThrowerDisp //cb.ice_exception(ex); } + @Override public void throwCasA_async(AMD_Thrower_throwCasA cb, int a, int b, int c, Ice.Current current) throws A @@ -122,6 +130,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwCasB_async(AMD_Thrower_throwCasB cb, int a, int b, int c, Ice.Current current) throws B @@ -133,6 +142,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwCasC_async(AMD_Thrower_throwCasC cb, int a, int b, int c, Ice.Current current) throws C @@ -144,6 +154,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwUndeclaredA_async(AMD_Thrower_throwUndeclaredA cb, int a, Ice.Current current) { @@ -152,6 +163,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwUndeclaredB_async(AMD_Thrower_throwUndeclaredB cb, int a, int b, Ice.Current current) { @@ -161,6 +173,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwUndeclaredC_async(AMD_Thrower_throwUndeclaredC cb, int a, int b, int c, Ice.Current current) { @@ -171,36 +184,42 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwLocalException_async(AMD_Thrower_throwLocalException cb, Ice.Current current) { cb.ice_exception(new Ice.TimeoutException()); } + @Override public void throwNonIceException_async(AMD_Thrower_throwNonIceException cb, Ice.Current current) { throw new RuntimeException(); } + @Override public void throwAssertException_async(AMD_Thrower_throwAssertException cb, Ice.Current current) { throw new java.lang.AssertionError(); } + @Override public void throwMemoryLimitException_async(AMD_Thrower_throwMemoryLimitException cb, byte[] seq, Ice.Current current) { cb.ice_response(new byte[1024 * 20]); // 20KB is over the configured 10KB message size max. } + @Override public void throwLocalExceptionIdempotent_async(AMD_Thrower_throwLocalExceptionIdempotent cb, Ice.Current current) { cb.ice_exception(new Ice.TimeoutException()); } + @Override public void throwAfterResponse_async(AMD_Thrower_throwAfterResponse cb, Ice.Current current) { @@ -209,6 +228,7 @@ public final class AMDThrowerI extends _ThrowerDisp throw new RuntimeException(); } + @Override public void throwAfterException_async(AMD_Thrower_throwAfterException cb, Ice.Current current) throws A diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java index bc556b0b5eb..eb561223bb6 100644 --- a/java/test/Ice/exceptions/AllTests.java +++ b/java/test/Ice/exceptions/AllTests.java @@ -21,7 +21,6 @@ import test.Ice.exceptions.Test.AMI_Thrower_throwCasA; import test.Ice.exceptions.Test.AMI_Thrower_throwCasB; import test.Ice.exceptions.Test.AMI_Thrower_throwCasC; import test.Ice.exceptions.Test.AMI_Thrower_throwLocalException; -import test.Ice.exceptions.Test.AMI_Thrower_throwLocalExceptionIdempotent; import test.Ice.exceptions.Test.AMI_Thrower_throwNonIceException; import test.Ice.exceptions.Test.AMI_Thrower_throwUndeclaredA; import test.Ice.exceptions.Test.AMI_Thrower_throwUndeclaredB; @@ -1394,7 +1393,7 @@ public class AllTests first = communicator.createObjectAdapter("TestAdapter0"); try { - Ice.ObjectAdapter second = communicator.createObjectAdapter("TestAdapter0"); + communicator.createObjectAdapter("TestAdapter0"); test(false); } catch(Ice.AlreadyRegisteredException ex) @@ -1404,8 +1403,7 @@ public class AllTests try { - Ice.ObjectAdapter second = - communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011"); + communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011"); test(false); } catch(Ice.AlreadyRegisteredException ex) diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java index 1e17f5433a6..ef66546fa26 100644 --- a/java/test/Ice/exceptions/Client.java +++ b/java/test/Ice/exceptions/Client.java @@ -13,6 +13,7 @@ import test.Ice.exceptions.Test.ThrowerPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java index 05ddb1c1be1..004f5a67e15 100644 --- a/java/test/Ice/exceptions/Collocated.java +++ b/java/test/Ice/exceptions/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.exceptions; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { @@ -24,6 +25,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/exceptions/DummyLogger.java b/java/test/Ice/exceptions/DummyLogger.java index 1caa3ab219b..afa09a9a6fb 100644 --- a/java/test/Ice/exceptions/DummyLogger.java +++ b/java/test/Ice/exceptions/DummyLogger.java @@ -12,26 +12,31 @@ package test.Ice.exceptions; public final class DummyLogger implements Ice.Logger { + @Override public void print(String message) { } + @Override public void trace(String category, String message) { } + @Override public void warning(String message) { } + @Override public void error(String message) { } + @Override public Ice.Logger cloneWithPrefix(String prefix) { diff --git a/java/test/Ice/exceptions/ObjectFactoryI.java b/java/test/Ice/exceptions/ObjectFactoryI.java index 97778fd29dd..87dd29b637b 100644 --- a/java/test/Ice/exceptions/ObjectFactoryI.java +++ b/java/test/Ice/exceptions/ObjectFactoryI.java @@ -12,11 +12,13 @@ package test.Ice.exceptions; public final class ObjectFactoryI implements Ice.ObjectFactory { + @Override public Ice.Object create(String s) { return null; } + @Override public void destroy() { } diff --git a/java/test/Ice/exceptions/ServantLocatorI.java b/java/test/Ice/exceptions/ServantLocatorI.java index 2cda43ba9aa..6619cd8f40c 100644 --- a/java/test/Ice/exceptions/ServantLocatorI.java +++ b/java/test/Ice/exceptions/ServantLocatorI.java @@ -12,15 +12,18 @@ package test.Ice.exceptions; public final class ServantLocatorI implements Ice.ServantLocator { + @Override public Ice.Object locate(Ice.Current curr, Ice.LocalObjectHolder cookie) { return null; } + @Override public void finished(Ice.Current curr, Ice.Object servant, java.lang.Object cookie) { } + @Override public void deactivate(String category) { } diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java index fc552f80efa..99157b088b4 100644 --- a/java/test/Ice/exceptions/Server.java +++ b/java/test/Ice/exceptions/Server.java @@ -11,6 +11,7 @@ package test.Ice.exceptions; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java index f15db3be407..8859147bd36 100644 --- a/java/test/Ice/exceptions/ThrowerI.java +++ b/java/test/Ice/exceptions/ThrowerI.java @@ -22,24 +22,28 @@ public final class ThrowerI extends _ThrowerDisp { } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public boolean supportsUndeclaredExceptions(Ice.Current current) { return false; } + @Override public boolean supportsAssertException(Ice.Current current) { return true; } + @Override public void throwAasA(int a, Ice.Current current) throws A @@ -49,6 +53,7 @@ public final class ThrowerI extends _ThrowerDisp throw ex; } + @Override public void throwAorDasAorD(int a, Ice.Current current) throws A, @@ -68,6 +73,7 @@ public final class ThrowerI extends _ThrowerDisp } } + @Override public void throwBasA(int a, int b, Ice.Current current) throws A @@ -75,6 +81,7 @@ public final class ThrowerI extends _ThrowerDisp throwBasB(a, b, current); } + @Override public void throwBasB(int a, int b, Ice.Current current) throws B @@ -85,6 +92,7 @@ public final class ThrowerI extends _ThrowerDisp throw ex; } + @Override public void throwCasA(int a, int b, int c, Ice.Current current) throws A @@ -92,6 +100,7 @@ public final class ThrowerI extends _ThrowerDisp throwCasC(a, b, c, current); } + @Override public void throwCasB(int a, int b, int c, Ice.Current current) throws B @@ -99,6 +108,7 @@ public final class ThrowerI extends _ThrowerDisp throwCasC(a, b, c, current); } + @Override public void throwCasC(int a, int b, int c, Ice.Current current) throws C @@ -110,6 +120,7 @@ public final class ThrowerI extends _ThrowerDisp throw ex; } + @Override public void throwUndeclaredA(int a, Ice.Current current) { @@ -117,6 +128,7 @@ public final class ThrowerI extends _ThrowerDisp throw new Ice.UnknownUserException(); } + @Override public void throwUndeclaredB(int a, int b, Ice.Current current) { @@ -124,6 +136,7 @@ public final class ThrowerI extends _ThrowerDisp throw new Ice.UnknownUserException(); } + @Override public void throwUndeclaredC(int a, int b, int c, Ice.Current current) { @@ -131,36 +144,42 @@ public final class ThrowerI extends _ThrowerDisp throw new Ice.UnknownUserException(); } + @Override public void throwLocalException(Ice.Current current) { throw new Ice.TimeoutException(); } + @Override public void throwLocalExceptionIdempotent(Ice.Current current) { throw new Ice.TimeoutException(); } + @Override public void throwNonIceException(Ice.Current current) { throw new RuntimeException(); } + @Override public void throwAssertException(Ice.Current current) { throw new java.lang.AssertionError(); } + @Override public byte[] throwMemoryLimitException(byte[] seq, Ice.Current current) { return new byte[1024 * 20]; // 20KB is over the configured 10KB message size max. } + @Override public void throwAfterResponse(Ice.Current current) { @@ -169,6 +188,7 @@ public final class ThrowerI extends _ThrowerDisp // } + @Override public void throwAfterException(Ice.Current current) throws A diff --git a/java/test/Ice/facets/AI.java b/java/test/Ice/facets/AI.java index 4da307a5643..eb993bf3082 100644 --- a/java/test/Ice/facets/AI.java +++ b/java/test/Ice/facets/AI.java @@ -18,6 +18,7 @@ public final class AI extends _ADisp { } + @Override public String callA(Ice.Current current) { diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java index 8f59a58aa1c..79308c3b113 100644 --- a/java/test/Ice/facets/AllTests.java +++ b/java/test/Ice/facets/AllTests.java @@ -9,7 +9,6 @@ package test.Ice.facets; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.facets.Test.DPrx; diff --git a/java/test/Ice/facets/BI.java b/java/test/Ice/facets/BI.java index aa6a6d7aaf4..bcc05365e0f 100644 --- a/java/test/Ice/facets/BI.java +++ b/java/test/Ice/facets/BI.java @@ -18,12 +18,14 @@ public final class BI extends _BDisp { } + @Override public String callA(Ice.Current current) { return "A"; } + @Override public String callB(Ice.Current current) { diff --git a/java/test/Ice/facets/CI.java b/java/test/Ice/facets/CI.java index b14da689e68..fab2a5758ee 100644 --- a/java/test/Ice/facets/CI.java +++ b/java/test/Ice/facets/CI.java @@ -18,12 +18,14 @@ public final class CI extends _CDisp { } + @Override public String callA(Ice.Current current) { return "A"; } + @Override public String callC(Ice.Current current) { diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java index ebb0f3eebbc..22867839eb7 100644 --- a/java/test/Ice/facets/Client.java +++ b/java/test/Ice/facets/Client.java @@ -13,6 +13,7 @@ import test.Ice.facets.Test.GPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java index 7b477639983..9503a7e7748 100644 --- a/java/test/Ice/facets/Collocated.java +++ b/java/test/Ice/facets/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.facets; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -29,6 +30,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/facets/DI.java b/java/test/Ice/facets/DI.java index faffef93149..cd4274dbaac 100644 --- a/java/test/Ice/facets/DI.java +++ b/java/test/Ice/facets/DI.java @@ -18,24 +18,28 @@ public final class DI extends _DDisp { } + @Override public String callA(Ice.Current current) { return "A"; } + @Override public String callB(Ice.Current current) { return "B"; } + @Override public String callC(Ice.Current current) { return "C"; } + @Override public String callD(Ice.Current current) { diff --git a/java/test/Ice/facets/EI.java b/java/test/Ice/facets/EI.java index be3afa6df01..6ebeb0ee8b3 100644 --- a/java/test/Ice/facets/EI.java +++ b/java/test/Ice/facets/EI.java @@ -18,6 +18,7 @@ public final class EI extends _EDisp { } + @Override public String callE(Ice.Current current) { diff --git a/java/test/Ice/facets/FI.java b/java/test/Ice/facets/FI.java index 5c8694f5b0e..5d945d86714 100644 --- a/java/test/Ice/facets/FI.java +++ b/java/test/Ice/facets/FI.java @@ -18,12 +18,14 @@ public final class FI extends _FDisp { } + @Override public String callE(Ice.Current current) { return "E"; } + @Override public String callF(Ice.Current current) { diff --git a/java/test/Ice/facets/GI.java b/java/test/Ice/facets/GI.java index c8b3902f0a2..397501ddeb7 100644 --- a/java/test/Ice/facets/GI.java +++ b/java/test/Ice/facets/GI.java @@ -19,12 +19,14 @@ public final class GI extends _GDisp _communicator = communicator; } + @Override public String callG(Ice.Current current) { return "G"; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/facets/HI.java b/java/test/Ice/facets/HI.java index 177020227d3..49bc8de2337 100644 --- a/java/test/Ice/facets/HI.java +++ b/java/test/Ice/facets/HI.java @@ -19,18 +19,21 @@ public final class HI extends _HDisp _communicator = communicator; } + @Override public String callG(Ice.Current current) { return "G"; } + @Override public String callH(Ice.Current current) { return "H"; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java index a4422d75215..0bba8b89cdf 100644 --- a/java/test/Ice/facets/Server.java +++ b/java/test/Ice/facets/Server.java @@ -11,6 +11,7 @@ package test.Ice.facets; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -28,6 +29,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java index f11f0507a16..4e334301a62 100644 --- a/java/test/Ice/faultTolerance/AllTests.java +++ b/java/test/Ice/faultTolerance/AllTests.java @@ -9,7 +9,6 @@ package test.Ice.faultTolerance; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.faultTolerance.Test.TestIntfPrx; @@ -124,6 +123,7 @@ public class AllTests private static class AbortCallback extends Ice.Callback { + @Override public void completed(Ice.AsyncResult result) { diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java index e1ffa8412bd..7f2fb23b80e 100644 --- a/java/test/Ice/faultTolerance/Client.java +++ b/java/test/Ice/faultTolerance/Client.java @@ -20,6 +20,7 @@ public class Client extends test.Util.Application System.err.println("Usage: Client port..."); } + @Override public int run(String[] args) { @@ -80,6 +81,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java index 6b8e20356e2..18d113fdeae 100644 --- a/java/test/Ice/faultTolerance/Server.java +++ b/java/test/Ice/faultTolerance/Server.java @@ -19,6 +19,7 @@ public class Server extends test.Util.Application System.err.println("Usage: Server port"); } + @Override public int run(String[] args) { @@ -69,6 +70,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/Ice/faultTolerance/TestI.java index bec0085ef3e..3d3b362bd0a 100644 --- a/java/test/Ice/faultTolerance/TestI.java +++ b/java/test/Ice/faultTolerance/TestI.java @@ -19,24 +19,28 @@ public final class TestI extends _TestIntfDisp _pseudoPid = port; // We use the port number instead of the process ID in Java. } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public void abort(Ice.Current current) { Runtime.getRuntime().halt(0); } + @Override public void idempotentAbort(Ice.Current current) { Runtime.getRuntime().halt(0); } + @Override public int pid(Ice.Current current) { diff --git a/java/test/Ice/hash/Client.java b/java/test/Ice/hash/Client.java index 4587cf34305..6a01bf62285 100644 --- a/java/test/Ice/hash/Client.java +++ b/java/test/Ice/hash/Client.java @@ -33,6 +33,7 @@ public class Client extends test.Util.Application System.exit(status); } + @Override public int run(String[] args) { PrintWriter out = getWriter(); diff --git a/java/test/Ice/hold/AllTests.java b/java/test/Ice/hold/AllTests.java index caebd64a131..d320ea52ae8 100644 --- a/java/test/Ice/hold/AllTests.java +++ b/java/test/Ice/hold/AllTests.java @@ -9,7 +9,6 @@ package test.Ice.hold; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.hold.Test.HoldPrx; @@ -74,6 +73,7 @@ public class AllTests { } + @Override synchronized public void sent(boolean sync) { diff --git a/java/test/Ice/hold/Client.java b/java/test/Ice/hold/Client.java index 65c82df0875..58e4e1abd32 100644 --- a/java/test/Ice/hold/Client.java +++ b/java/test/Ice/hold/Client.java @@ -11,6 +11,7 @@ package test.Ice.hold; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -18,6 +19,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/hold/HoldI.java b/java/test/Ice/hold/HoldI.java index 00a80469bbc..0ca55e6dac2 100644 --- a/java/test/Ice/hold/HoldI.java +++ b/java/test/Ice/hold/HoldI.java @@ -30,6 +30,7 @@ public final class HoldI extends _HoldDisp _last = 0; } + @Override public void putOnHold(int milliSeconds, Ice.Current current) { @@ -46,6 +47,7 @@ public final class HoldI extends _HoldDisp { _timer.schedule(new java.util.TimerTask() { + @Override public void run() { @@ -61,11 +63,13 @@ public final class HoldI extends _HoldDisp } } + @Override public void waitForHold(final Ice.Current current) { _timer.schedule(new java.util.TimerTask() { + @Override public void run() { @@ -87,6 +91,7 @@ public final class HoldI extends _HoldDisp } + @Override public int set(int value, int delay, Ice.Current current) { @@ -106,6 +111,7 @@ public final class HoldI extends _HoldDisp } } + @Override synchronized public void setOneway(int value, int expected, Ice.Current current) { @@ -118,6 +124,7 @@ public final class HoldI extends _HoldDisp _last = value; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/hold/Server.java b/java/test/Ice/hold/Server.java index 65106fada4f..97019f8021e 100644 --- a/java/test/Ice/hold/Server.java +++ b/java/test/Ice/hold/Server.java @@ -11,6 +11,7 @@ package test.Ice.hold; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -33,6 +34,7 @@ public class Server extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/info/Client.java b/java/test/Ice/info/Client.java index 201106f63ba..2cd0d5b1f8b 100644 --- a/java/test/Ice/info/Client.java +++ b/java/test/Ice/info/Client.java @@ -11,12 +11,14 @@ package test.Ice.info; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(communicator(), getWriter()); return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/info/Server.java b/java/test/Ice/info/Server.java index 0d96a049118..ebb4046e721 100644 --- a/java/test/Ice/info/Server.java +++ b/java/test/Ice/info/Server.java @@ -11,6 +11,7 @@ package test.Ice.info; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/info/TestI.java b/java/test/Ice/info/TestI.java index 75b1f5bb904..316cf7e438f 100644 --- a/java/test/Ice/info/TestI.java +++ b/java/test/Ice/info/TestI.java @@ -16,11 +16,13 @@ public class TestI extends _TestIntfDisp { } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public java.util.Map<String, String> getEndpointInfoAsContext(Ice.Current c) { java.util.Map<String, String> ctx = new java.util.HashMap<String, String>(); @@ -45,6 +47,7 @@ public class TestI extends _TestIntfDisp return ctx; } + @Override public java.util.Map<String, String> getConnectionInfoAsContext(Ice.Current c) { java.util.Map<String, String> ctx = new java.util.HashMap<String, String>(); diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java index 2b5f9f93873..5a53c6916a1 100644 --- a/java/test/Ice/inheritance/AllTests.java +++ b/java/test/Ice/inheritance/AllTests.java @@ -9,7 +9,6 @@ package test.Ice.inheritance; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.inheritance.Test.InitialPrx; @@ -214,7 +213,6 @@ public class AllTests out.print("ditto, but for class implementing interfaces... "); out.flush(); - CDPrx cdo; cao = cd.caop(cd); test(cao.equals(cd)); diff --git a/java/test/Ice/inheritance/CAI.java b/java/test/Ice/inheritance/CAI.java index 4db69aa0d0a..b867eb6f836 100644 --- a/java/test/Ice/inheritance/CAI.java +++ b/java/test/Ice/inheritance/CAI.java @@ -19,6 +19,7 @@ public final class CAI extends CA { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/Ice/inheritance/CBI.java index e6e8d9f7005..6f07ec9b167 100644 --- a/java/test/Ice/inheritance/CBI.java +++ b/java/test/Ice/inheritance/CBI.java @@ -20,12 +20,14 @@ public final class CBI extends CB { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { return p; } + @Override public CBPrx cbop(CBPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/CCI.java b/java/test/Ice/inheritance/CCI.java index 3f737b246f6..1d88806b959 100644 --- a/java/test/Ice/inheritance/CCI.java +++ b/java/test/Ice/inheritance/CCI.java @@ -21,18 +21,21 @@ public final class CCI extends CC { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { return p; } + @Override public CCPrx ccop(CCPrx p, Ice.Current current) { return p; } + @Override public CBPrx cbop(CBPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/Ice/inheritance/CDI.java index 6b21b135117..a1ac62fdf14 100644 --- a/java/test/Ice/inheritance/CDI.java +++ b/java/test/Ice/inheritance/CDI.java @@ -25,42 +25,49 @@ public final class CDI extends CD { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { return p; } + @Override public CCPrx ccop(CCPrx p, Ice.Current current) { return p; } + @Override public CDPrx cdop(CDPrx p, Ice.Current current) { return p; } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public CBPrx cbop(CBPrx p, Ice.Current current) { return p; } + @Override public IB1Prx ib1op(IB1Prx p, Ice.Current current) { return p; } + @Override public IB2Prx ib2op(IB2Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java index f03d0917b5c..1fc5bdb3214 100644 --- a/java/test/Ice/inheritance/Client.java +++ b/java/test/Ice/inheritance/Client.java @@ -13,6 +13,7 @@ import test.Ice.inheritance.Test.InitialPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java index af2bda6b221..3c92c35545c 100644 --- a/java/test/Ice/inheritance/Collocated.java +++ b/java/test/Ice/inheritance/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.inheritance; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -23,6 +24,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/inheritance/IAI.java b/java/test/Ice/inheritance/IAI.java index 9d471939bb8..6f783f0bc58 100644 --- a/java/test/Ice/inheritance/IAI.java +++ b/java/test/Ice/inheritance/IAI.java @@ -19,6 +19,7 @@ public final class IAI extends _IADisp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/IB1I.java b/java/test/Ice/inheritance/IB1I.java index b71b5e0451e..0c1de6cfb99 100644 --- a/java/test/Ice/inheritance/IB1I.java +++ b/java/test/Ice/inheritance/IB1I.java @@ -20,12 +20,14 @@ public final class IB1I extends _IB1Disp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public IB1Prx ib1op(IB1Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/IB2I.java b/java/test/Ice/inheritance/IB2I.java index d211349eedf..07fc2e53baa 100644 --- a/java/test/Ice/inheritance/IB2I.java +++ b/java/test/Ice/inheritance/IB2I.java @@ -20,12 +20,14 @@ public final class IB2I extends _IB2Disp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public IB2Prx ib2op(IB2Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/ICI.java b/java/test/Ice/inheritance/ICI.java index 158553bf46b..4ff569dbf16 100644 --- a/java/test/Ice/inheritance/ICI.java +++ b/java/test/Ice/inheritance/ICI.java @@ -22,24 +22,28 @@ public final class ICI extends _ICDisp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public ICPrx icop(ICPrx p, Ice.Current current) { return p; } + @Override public IB1Prx ib1op(IB1Prx p, Ice.Current current) { return p; } + @Override public IB2Prx ib2op(IB2Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/InitialI.java b/java/test/Ice/inheritance/InitialI.java index 0c3195d7218..083314cf62d 100644 --- a/java/test/Ice/inheritance/InitialI.java +++ b/java/test/Ice/inheritance/InitialI.java @@ -42,54 +42,63 @@ public final class InitialI extends _InitialDisp _ic = ICPrxHelper.uncheckedCast(adapter.addWithUUID(new ICI())); } + @Override public CAPrx caop(Ice.Current current) { return _ca; } + @Override public CBPrx cbop(Ice.Current current) { return _cb; } + @Override public CCPrx ccop(Ice.Current current) { return _cc; } + @Override public CDPrx cdop(Ice.Current current) { return _cd; } + @Override public IAPrx iaop(Ice.Current current) { return _ia; } + @Override public IB1Prx ib1op(Ice.Current current) { return _ib1; } + @Override public IB2Prx ib2op(Ice.Current current) { return _ib2; } + @Override public ICPrx icop(Ice.Current current) { return _ic; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java index b55b5213664..7ff0278c2a6 100644 --- a/java/test/Ice/inheritance/Server.java +++ b/java/test/Ice/inheritance/Server.java @@ -11,6 +11,7 @@ package test.Ice.inheritance; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/interceptor/AMDInterceptorI.java b/java/test/Ice/interceptor/AMDInterceptorI.java index 741dfc7a691..e9cc88a1ba5 100644 --- a/java/test/Ice/interceptor/AMDInterceptorI.java +++ b/java/test/Ice/interceptor/AMDInterceptorI.java @@ -22,6 +22,7 @@ class AMDInterceptorI extends InterceptorI implements Ice.DispatchInterceptorAsy super(servant); } + @Override public Ice.DispatchStatus dispatch(Ice.Request request) { @@ -34,12 +35,14 @@ class AMDInterceptorI extends InterceptorI implements Ice.DispatchInterceptorAsy { Ice.DispatchInterceptorAsyncCallback cb = new Ice.DispatchInterceptorAsyncCallback() { + @Override public boolean response(boolean ok) { test(ok); return false; } + @Override public boolean exception(java.lang.Exception ex) { test(ex instanceof RetryException); @@ -59,18 +62,21 @@ class AMDInterceptorI extends InterceptorI implements Ice.DispatchInterceptorAsy return _lastStatus; } + @Override public boolean response(boolean ok) { setActualStatus(ok ? Ice.DispatchStatus.DispatchOK : Ice.DispatchStatus.DispatchUserException); return true; } + @Override public boolean exception(java.lang.Exception ex) { setActualStatus(ex); return true; } + @Override void clear() { diff --git a/java/test/Ice/interceptor/Client.java b/java/test/Ice/interceptor/Client.java index f55d873695d..12c913296b0 100644 --- a/java/test/Ice/interceptor/Client.java +++ b/java/test/Ice/interceptor/Client.java @@ -195,6 +195,7 @@ public class Client extends test.Util.Application return 0; } + @Override public int run(String[] args) { @@ -247,6 +248,7 @@ public class Client extends test.Util.Application } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/interceptor/InterceptorI.java b/java/test/Ice/interceptor/InterceptorI.java index cede400f0a6..04458722e3a 100644 --- a/java/test/Ice/interceptor/InterceptorI.java +++ b/java/test/Ice/interceptor/InterceptorI.java @@ -28,6 +28,7 @@ class InterceptorI extends Ice.DispatchInterceptor } + @Override public Ice.DispatchStatus dispatch(Ice.Request request) { diff --git a/java/test/Ice/interceptor/MyObjectI.java b/java/test/Ice/interceptor/MyObjectI.java index 7e1e87f641b..a2c10f04d38 100644 --- a/java/test/Ice/interceptor/MyObjectI.java +++ b/java/test/Ice/interceptor/MyObjectI.java @@ -21,16 +21,18 @@ import test.Ice.interceptor.Test._MyObjectDisp; class MyObjectI extends _MyObjectDisp { + @Override public int add(int x, int y, Ice.Current current) { return x + y; } + @Override public int addWithRetry(int x, int y, Ice.Current current) { - String val = (String)current.ctx.get("retry"); + String val = current.ctx.get("retry"); if(val == null || !val.equals("no")) { @@ -39,18 +41,21 @@ class MyObjectI extends _MyObjectDisp return x + y; } + @Override public int badAdd(int x, int y, Ice.Current current) throws InvalidInputException { throw new InvalidInputException(); } + @Override public int notExistAdd(int x, int y, Ice.Current current) { throw new Ice.ObjectNotExistException(); } + @Override public int badSystemAdd(int x, int y, Ice.Current current) { @@ -62,11 +67,13 @@ class MyObjectI extends _MyObjectDisp // AMD // + @Override public void amdAdd_async(final AMD_MyObject_amdAdd cb, final int x, final int y, Ice.Current current) { Thread thread = new Thread() { + @Override public void run() { @@ -85,11 +92,13 @@ class MyObjectI extends _MyObjectDisp thread.start(); } + @Override public void amdAddWithRetry_async(final AMD_MyObject_amdAddWithRetry cb, final int x, final int y, Ice.Current current) { Thread thread = new Thread() { + @Override public void run() { @@ -107,7 +116,7 @@ class MyObjectI extends _MyObjectDisp thread.setDaemon(true); thread.start(); - String val = (String)current.ctx.get("retry"); + String val = current.ctx.get("retry"); if(val == null || !val.equals("no")) { @@ -115,11 +124,13 @@ class MyObjectI extends _MyObjectDisp } } + @Override public void amdBadAdd_async(final AMD_MyObject_amdBadAdd cb, int x, int y, Ice.Current current) { Thread thread = new Thread() { + @Override public void run() { @@ -138,11 +149,13 @@ class MyObjectI extends _MyObjectDisp thread.start(); } + @Override public void amdNotExistAdd_async(final AMD_MyObject_amdNotExistAdd cb, int x, int y, Ice.Current current) { Thread thread = new Thread() { + @Override public void run() { @@ -161,11 +174,13 @@ class MyObjectI extends _MyObjectDisp thread.start(); } + @Override public void amdBadSystemAdd_async(final AMD_MyObject_amdBadSystemAdd cb, int x, int y, Ice.Current current) { Thread thread = new Thread() { + @Override public void run() { diff --git a/java/test/Ice/interceptor/MySystemException.java b/java/test/Ice/interceptor/MySystemException.java index 5a1673d677f..ee7bc5a626b 100644 --- a/java/test/Ice/interceptor/MySystemException.java +++ b/java/test/Ice/interceptor/MySystemException.java @@ -16,6 +16,7 @@ public class MySystemException extends Ice.SystemException { } + @Override public String ice_name() { diff --git a/java/test/Ice/interrupt/AllTests.java b/java/test/Ice/interrupt/AllTests.java index 053de7c909a..69644e735b0 100644 --- a/java/test/Ice/interrupt/AllTests.java +++ b/java/test/Ice/interrupt/AllTests.java @@ -21,11 +21,9 @@ import test.Ice.interrupt.Test.TestIntfControllerPrx; import test.Ice.interrupt.Test.TestIntfControllerPrxHelper; import test.Ice.interrupt.Test.TestIntfPrx; import test.Ice.interrupt.Test.TestIntfPrxHelper; -import Ice.CommunicatorDestroyedException; import Ice.LocalException; import Ice.OperationInterruptedException; import Ice.UserException; -import IceInternal.Time; public class AllTests { diff --git a/java/test/Ice/interrupt/TestI.java b/java/test/Ice/interrupt/TestI.java index cc267571c6f..8f72d7d45a8 100644 --- a/java/test/Ice/interrupt/TestI.java +++ b/java/test/Ice/interrupt/TestI.java @@ -11,15 +11,6 @@ package test.Ice.interrupt; public class TestI extends test.Ice.interrupt.Test._TestIntfDisp { - private static void - test(boolean b) - { - if(!b) - { - throw new RuntimeException(); - } - } - TestI(TestControllerI controller) { _controller = controller; diff --git a/java/test/Ice/invoke/BlobjectAsyncI.java b/java/test/Ice/invoke/BlobjectAsyncI.java index 4a2bb807456..c7e0837b946 100644 --- a/java/test/Ice/invoke/BlobjectAsyncI.java +++ b/java/test/Ice/invoke/BlobjectAsyncI.java @@ -13,6 +13,7 @@ import test.Ice.invoke.Test.MyException; public class BlobjectAsyncI extends Ice.BlobjectAsync { + @Override public void ice_invoke_async(Ice.AMD_Object_ice_invoke cb, byte[] inParams, Ice.Current current) { diff --git a/java/test/Ice/invoke/BlobjectI.java b/java/test/Ice/invoke/BlobjectI.java index 38457fe3527..c676c38dc63 100644 --- a/java/test/Ice/invoke/BlobjectI.java +++ b/java/test/Ice/invoke/BlobjectI.java @@ -13,6 +13,7 @@ import test.Ice.invoke.Test.MyException; public class BlobjectI extends Ice.Blobject { + @Override public boolean ice_invoke(byte[] inParams, Ice.ByteSeqHolder outParams, Ice.Current current) { diff --git a/java/test/Ice/invoke/Client.java b/java/test/Ice/invoke/Client.java index 4cfe8155cae..e589d32075c 100644 --- a/java/test/Ice/invoke/Client.java +++ b/java/test/Ice/invoke/Client.java @@ -13,6 +13,7 @@ import test.Ice.invoke.Test.MyClassPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { MyClassPrx myClass = AllTests.allTests(communicator(), getWriter()); @@ -48,6 +49,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/invoke/ServantLocatorI.java b/java/test/Ice/invoke/ServantLocatorI.java index 4c2a59e0919..9ed2262b995 100644 --- a/java/test/Ice/invoke/ServantLocatorI.java +++ b/java/test/Ice/invoke/ServantLocatorI.java @@ -23,17 +23,20 @@ public class ServantLocatorI implements Ice.ServantLocator } } + @Override public Ice.Object locate(Ice.Current current, Ice.LocalObjectHolder cookie) { return _blobject; } + @Override public void finished(Ice.Current current, Ice.Object servant, java.lang.Object cookie) { } + @Override public void deactivate(String category) { diff --git a/java/test/Ice/invoke/Server.java b/java/test/Ice/invoke/Server.java index c670c5670d6..a6f315d5cf9 100644 --- a/java/test/Ice/invoke/Server.java +++ b/java/test/Ice/invoke/Server.java @@ -11,6 +11,7 @@ package test.Ice.invoke; public class Server extends test.Util.Application { + @Override public int run(String[] args) { boolean async = false; @@ -29,6 +30,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/location/Client.java b/java/test/Ice/location/Client.java index e18f86008f5..4fc8e67893b 100644 --- a/java/test/Ice/location/Client.java +++ b/java/test/Ice/location/Client.java @@ -11,6 +11,7 @@ package test.Ice.location; public class Client extends test.Util.Application { + @Override public int run(String[] args) { try @@ -36,6 +37,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/location/HelloI.java b/java/test/Ice/location/HelloI.java index 95aa8d0e48f..5036d4cbc18 100644 --- a/java/test/Ice/location/HelloI.java +++ b/java/test/Ice/location/HelloI.java @@ -14,6 +14,7 @@ import test.Ice.location.Test._HelloDisp; public class HelloI extends _HelloDisp { + @Override public void sayHello(Ice.Current current) { diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java index d6bf84e78c7..4b09338d2ee 100644 --- a/java/test/Ice/location/Server.java +++ b/java/test/Ice/location/Server.java @@ -13,6 +13,7 @@ public class Server extends test.Util.Application { private Ice.InitializationData _initData; + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -45,6 +46,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/location/ServerLocator.java b/java/test/Ice/location/ServerLocator.java index 4e278e2adb3..0e27e888eb7 100644 --- a/java/test/Ice/location/ServerLocator.java +++ b/java/test/Ice/location/ServerLocator.java @@ -21,6 +21,7 @@ public class ServerLocator extends _TestLocatorDisp _requestCount = 0; } + @Override public void findAdapterById_async(Ice.AMD_Locator_findAdapterById response, String adapter, Ice.Current current) throws Ice.AdapterNotFoundException @@ -45,6 +46,7 @@ public class ServerLocator extends _TestLocatorDisp response.ice_response(_registry.getAdapter(adapter)); } + @Override public void findObjectById_async(Ice.AMD_Locator_findObjectById response, Ice.Identity id, Ice.Current current) throws Ice.ObjectNotFoundException @@ -62,12 +64,14 @@ public class ServerLocator extends _TestLocatorDisp response.ice_response(_registry.getObject(id)); } + @Override public Ice.LocatorRegistryPrx getRegistry(Ice.Current current) { return _registryPrx; } + @Override public int getRequestCount(Ice.Current current) { diff --git a/java/test/Ice/location/ServerLocatorRegistry.java b/java/test/Ice/location/ServerLocatorRegistry.java index 4e088ef8f28..7a9fbc50ac8 100644 --- a/java/test/Ice/location/ServerLocatorRegistry.java +++ b/java/test/Ice/location/ServerLocatorRegistry.java @@ -13,6 +13,7 @@ import test.Ice.location.Test._TestLocatorRegistryDisp; public class ServerLocatorRegistry extends _TestLocatorRegistryDisp { + @Override public void setAdapterDirectProxy_async(Ice.AMD_LocatorRegistry_setAdapterDirectProxy cb, String adapter, Ice.ObjectPrx object, Ice.Current current) @@ -28,6 +29,7 @@ public class ServerLocatorRegistry extends _TestLocatorRegistryDisp cb.ice_response(); } + @Override public void setReplicatedAdapterDirectProxy_async(Ice.AMD_LocatorRegistry_setReplicatedAdapterDirectProxy cb, String adapter, String replica, Ice.ObjectPrx object, Ice.Current current) @@ -45,12 +47,14 @@ public class ServerLocatorRegistry extends _TestLocatorRegistryDisp cb.ice_response(); } + @Override public void setServerProcessProxy_async(Ice.AMD_LocatorRegistry_setServerProcessProxy cb, String id, Ice.ProcessPrx proxy, Ice.Current current) { } + @Override public void addObject(Ice.ObjectPrx object, Ice.Current current) { diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java index 11ae27ef4a3..2ac89074ad7 100644 --- a/java/test/Ice/location/ServerManagerI.java +++ b/java/test/Ice/location/ServerManagerI.java @@ -28,6 +28,7 @@ public class ServerManagerI extends _ServerManagerDisp _initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2"); } + @Override public void startServer(Ice.Current current) { @@ -72,6 +73,7 @@ public class ServerManagerI extends _ServerManagerDisp adapter2.activate(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/location/TestI.java b/java/test/Ice/location/TestI.java index a64c51ccc56..de3c6213bd7 100644 --- a/java/test/Ice/location/TestI.java +++ b/java/test/Ice/location/TestI.java @@ -25,12 +25,14 @@ public class TestI extends _TestIntfDisp _registry.addObject(_adapter1.add(new HelloI(), _adapter1.getCommunicator().stringToIdentity("hello"))); } + @Override public void shutdown(Ice.Current current) { _adapter1.getCommunicator().shutdown(); } + @Override public HelloPrx getHello(Ice.Current current) { @@ -38,12 +40,14 @@ public class TestI extends _TestIntfDisp _adapter1.getCommunicator().stringToIdentity("hello"))); } + @Override public HelloPrx getReplicatedHello(Ice.Current current) { return HelloPrxHelper.uncheckedCast(_adapter1.createProxy(_adapter1.getCommunicator().stringToIdentity("hello"))); } + @Override public void migrateHello(Ice.Current current) { diff --git a/java/test/Ice/metrics/AMDMetricsI.java b/java/test/Ice/metrics/AMDMetricsI.java index 6c45a12ed52..e557e728a4e 100644 --- a/java/test/Ice/metrics/AMDMetricsI.java +++ b/java/test/Ice/metrics/AMDMetricsI.java @@ -17,12 +17,14 @@ public final class AMDMetricsI extends _MetricsDisp { } + @Override public void op_async(AMD_Metrics_op cb, Ice.Current current) { cb.ice_response(); } + @Override public void fail_async(AMD_Metrics_fail cb, Ice.Current current) { @@ -30,6 +32,7 @@ public final class AMDMetricsI extends _MetricsDisp cb.ice_response(); } + @Override public void opWithUserException_async(AMD_Metrics_opWithUserException cb, Ice.Current current) throws UserEx @@ -37,36 +40,42 @@ public final class AMDMetricsI extends _MetricsDisp cb.ice_exception(new UserEx()); } + @Override public void opWithRequestFailedException_async(AMD_Metrics_opWithRequestFailedException cb, Ice.Current current) { cb.ice_exception(new Ice.ObjectNotExistException()); } + @Override public void opWithLocalException_async(AMD_Metrics_opWithLocalException cb, Ice.Current current) { cb.ice_exception(new Ice.SyscallException()); } + @Override public void opWithUnknownException_async(AMD_Metrics_opWithUnknownException cb, Ice.Current current) { cb.ice_exception(new IllegalArgumentException()); } + @Override public void opByteS_async(AMD_Metrics_opByteS cb, byte[] bs, Ice.Current current) { cb.ice_response(); } + @Override public Ice.ObjectPrx getAdmin(Ice.Current current) { return current.adapter.getCommunicator().getAdmin(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/metrics/AMDServer.java b/java/test/Ice/metrics/AMDServer.java index cedc8596656..dc559764811 100644 --- a/java/test/Ice/metrics/AMDServer.java +++ b/java/test/Ice/metrics/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.metrics; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -26,6 +27,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/metrics/AllTests.java b/java/test/Ice/metrics/AllTests.java index 12db7e2f13e..1a8724a91ab 100644 --- a/java/test/Ice/metrics/AllTests.java +++ b/java/test/Ice/metrics/AllTests.java @@ -65,6 +65,7 @@ public class AllTests _wait = true; } + @Override synchronized public void completed(Ice.AsyncResult result) { _wait = false; @@ -163,6 +164,7 @@ public class AllTests _updated = false; } + @Override public synchronized void updated(Map<String, String> dict) { @@ -262,6 +264,7 @@ public class AllTests static class Void implements Runnable { + @Override public void run() { } @@ -274,6 +277,7 @@ public class AllTests this.proxy = proxy; } + @Override public void run() { if(proxy.ice_getCachedConnection() != null) @@ -305,6 +309,7 @@ public class AllTests this.proxy = proxy; } + @Override public void run() { Map<String, String> ctx = new java.util.HashMap<String, String>(); diff --git a/java/test/Ice/metrics/ChildInvocationObserverI.java b/java/test/Ice/metrics/ChildInvocationObserverI.java index 8215cef34dd..da56f726250 100644 --- a/java/test/Ice/metrics/ChildInvocationObserverI.java +++ b/java/test/Ice/metrics/ChildInvocationObserverI.java @@ -11,6 +11,7 @@ package test.Ice.metrics; class ChildInvocationObserverI extends ObserverI implements Ice.Instrumentation.ChildInvocationObserver { + @Override public synchronized void reset() { @@ -18,6 +19,7 @@ class ChildInvocationObserverI extends ObserverI implements Ice.Instrumentation. replySize = 0; } + @Override public synchronized void reply(int s) { diff --git a/java/test/Ice/metrics/Client.java b/java/test/Ice/metrics/Client.java index be105a7ec80..48acc9244b1 100644 --- a/java/test/Ice/metrics/Client.java +++ b/java/test/Ice/metrics/Client.java @@ -13,6 +13,7 @@ import test.Ice.metrics.Test.MetricsPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -30,6 +31,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/metrics/Collocated.java b/java/test/Ice/metrics/Collocated.java index 47056dc8841..69a8896e1b5 100644 --- a/java/test/Ice/metrics/Collocated.java +++ b/java/test/Ice/metrics/Collocated.java @@ -13,6 +13,7 @@ import test.Ice.metrics.Test.MetricsPrx; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -40,6 +41,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/metrics/CommunicatorObserverI.java b/java/test/Ice/metrics/CommunicatorObserverI.java index 7561d68b4d4..996d5a83b1a 100644 --- a/java/test/Ice/metrics/CommunicatorObserverI.java +++ b/java/test/Ice/metrics/CommunicatorObserverI.java @@ -20,12 +20,14 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver } } + @Override public void setObserverUpdater(Ice.Instrumentation.ObserverUpdater u) { updater = u; } + @Override synchronized public Ice.Instrumentation.Observer getConnectionEstablishmentObserver(Ice.Endpoint e, String s) { @@ -38,6 +40,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver } + @Override synchronized public Ice.Instrumentation.Observer getEndpointLookupObserver(Ice.Endpoint e) { @@ -49,6 +52,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver return endpointLookupObserver; } + @Override synchronized public Ice.Instrumentation.ConnectionObserver getConnectionObserver(Ice.ConnectionInfo c, Ice.Endpoint e, @@ -64,6 +68,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver return connectionObserver; } + @Override synchronized public Ice.Instrumentation.ThreadObserver getThreadObserver(String p, String id, Ice.Instrumentation.ThreadState s, Ice.Instrumentation.ThreadObserver old) @@ -77,6 +82,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver return threadObserver; } + @Override synchronized public Ice.Instrumentation.InvocationObserver getInvocationObserver(Ice.ObjectPrx p, String op, java.util.Map<String, String> ctx) { @@ -88,6 +94,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver return invocationObserver; } + @Override synchronized public Ice.Instrumentation.DispatchObserver getDispatchObserver(Ice.Current current, int s) { diff --git a/java/test/Ice/metrics/ConnectionObserverI.java b/java/test/Ice/metrics/ConnectionObserverI.java index 25f83caac5e..395c31733e9 100644 --- a/java/test/Ice/metrics/ConnectionObserverI.java +++ b/java/test/Ice/metrics/ConnectionObserverI.java @@ -11,6 +11,7 @@ package test.Ice.metrics; class ConnectionObserverI extends ObserverI implements Ice.Instrumentation.ConnectionObserver { + @Override public synchronized void reset() { @@ -19,12 +20,14 @@ class ConnectionObserverI extends ObserverI implements Ice.Instrumentation.Conne sent = 0; } + @Override public synchronized void sentBytes(int s) { sent += s; } + @Override public synchronized void receivedBytes(int s) { diff --git a/java/test/Ice/metrics/ControllerI.java b/java/test/Ice/metrics/ControllerI.java index 05c8bb702b3..2f1434d523a 100644 --- a/java/test/Ice/metrics/ControllerI.java +++ b/java/test/Ice/metrics/ControllerI.java @@ -17,12 +17,14 @@ public final class ControllerI extends _ControllerDisp _adapter = adapter; } + @Override public void hold(Ice.Current current) { _adapter.hold(); _adapter.waitForHold(); } + @Override public void resume(Ice.Current current) { _adapter.activate(); diff --git a/java/test/Ice/metrics/DispatchObserverI.java b/java/test/Ice/metrics/DispatchObserverI.java index 920b821e239..43b0683696c 100644 --- a/java/test/Ice/metrics/DispatchObserverI.java +++ b/java/test/Ice/metrics/DispatchObserverI.java @@ -11,6 +11,7 @@ package test.Ice.metrics; class DispatchObserverI extends ObserverI implements Ice.Instrumentation.DispatchObserver { + @Override public synchronized void reset() { @@ -19,12 +20,14 @@ class DispatchObserverI extends ObserverI implements Ice.Instrumentation.Dispatc replySize = 0; } + @Override public synchronized void userException() { ++userExceptionCount; } + @Override public synchronized void reply(int s) { diff --git a/java/test/Ice/metrics/InvocationObserverI.java b/java/test/Ice/metrics/InvocationObserverI.java index 5457f85aff0..cfb7e2c6547 100644 --- a/java/test/Ice/metrics/InvocationObserverI.java +++ b/java/test/Ice/metrics/InvocationObserverI.java @@ -11,6 +11,7 @@ package test.Ice.metrics; class InvocationObserverI extends ObserverI implements Ice.Instrumentation.InvocationObserver { + @Override public synchronized void reset() { @@ -27,18 +28,21 @@ class InvocationObserverI extends ObserverI implements Ice.Instrumentation.Invoc } } + @Override public synchronized void retried() { ++retriedCount; } + @Override public synchronized void userException() { ++userExceptionCount; } + @Override public synchronized Ice.Instrumentation.RemoteObserver getRemoteObserver(Ice.ConnectionInfo c, Ice.Endpoint e, int a, int b) { @@ -51,6 +55,7 @@ class InvocationObserverI extends ObserverI implements Ice.Instrumentation.Invoc } + @Override public synchronized Ice.Instrumentation.CollocatedObserver getCollocatedObserver(Ice.ObjectAdapter adapter, int a, int b) { diff --git a/java/test/Ice/metrics/MetricsI.java b/java/test/Ice/metrics/MetricsI.java index 555cbbdd878..51f10fd2661 100644 --- a/java/test/Ice/metrics/MetricsI.java +++ b/java/test/Ice/metrics/MetricsI.java @@ -17,17 +17,20 @@ public final class MetricsI extends _MetricsDisp { } + @Override public void op(Ice.Current current) { } + @Override public void fail(Ice.Current current) { current.con.close(true); } + @Override public void opWithUserException(Ice.Current current) throws UserEx @@ -35,35 +38,41 @@ public final class MetricsI extends _MetricsDisp throw new UserEx(); } + @Override public void opWithRequestFailedException(Ice.Current current) { throw new Ice.ObjectNotExistException(); } + @Override public void opWithLocalException(Ice.Current current) { throw new Ice.SyscallException(); } + @Override public void opWithUnknownException(Ice.Current current) { throw new IllegalArgumentException(); } + @Override public void opByteS(byte[] bs, Ice.Current current) { } + @Override public Ice.ObjectPrx getAdmin(Ice.Current current) { return current.adapter.getCommunicator().getAdmin(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/metrics/ObserverI.java b/java/test/Ice/metrics/ObserverI.java index 46398fdb1b0..1dadf4d63d8 100644 --- a/java/test/Ice/metrics/ObserverI.java +++ b/java/test/Ice/metrics/ObserverI.java @@ -19,17 +19,20 @@ class ObserverI implements Ice.Instrumentation.Observer failedCount = 0; } + @Override synchronized public void attach() { ++total; ++current; } + @Override synchronized public void detach() { --current; } + @Override synchronized public void failed(String s) { diff --git a/java/test/Ice/metrics/Server.java b/java/test/Ice/metrics/Server.java index d1ca0fe6dfc..70788ea876f 100644 --- a/java/test/Ice/metrics/Server.java +++ b/java/test/Ice/metrics/Server.java @@ -11,6 +11,7 @@ package test.Ice.metrics; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -26,6 +27,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/metrics/ThreadObserverI.java b/java/test/Ice/metrics/ThreadObserverI.java index 59e754ba9ad..af24dfd7df1 100644 --- a/java/test/Ice/metrics/ThreadObserverI.java +++ b/java/test/Ice/metrics/ThreadObserverI.java @@ -11,6 +11,7 @@ package test.Ice.metrics; class ThreadObserverI extends ObserverI implements Ice.Instrumentation.ThreadObserver { + @Override public synchronized void reset() { @@ -18,6 +19,7 @@ class ThreadObserverI extends ObserverI implements Ice.Instrumentation.ThreadObs states = 0; } + @Override public synchronized void stateChanged(Ice.Instrumentation.ThreadState o, Ice.Instrumentation.ThreadState n) { diff --git a/java/test/Ice/objects/AllTests.java b/java/test/Ice/objects/AllTests.java index 68eb23ef4e5..ab43e76c368 100644 --- a/java/test/Ice/objects/AllTests.java +++ b/java/test/Ice/objects/AllTests.java @@ -29,8 +29,6 @@ import test.Ice.objects.Test.InitialPrxHelper; import test.Ice.objects.Test.J; import test.Ice.objects.Test.UnexpectedObjectExceptionTestPrx; import test.Ice.objects.Test.UnexpectedObjectExceptionTestPrxHelper; -import test.Ice.objects.Test.Compact; -import test.Ice.objects.Test.CompactExt; public class AllTests { @@ -98,7 +96,7 @@ public class AllTests test(((B)b1.theA).theA == b1.theA); test(((B)b1.theA).theB == b1); test(((B)b1.theA).theC instanceof C); - test(((C)(((B)b1.theA).theC)).theB == b1.theA); + test((((B)b1.theA).theC).theB == b1.theA); test(b1.preMarshalInvoked); test(b1.postUnmarshalInvoked(null)); test(b1.theA.preMarshalInvoked); diff --git a/java/test/Ice/objects/BI.java b/java/test/Ice/objects/BI.java index e4c4817568f..09aebe13501 100644 --- a/java/test/Ice/objects/BI.java +++ b/java/test/Ice/objects/BI.java @@ -19,18 +19,21 @@ public final class BI extends B _postUnmarshalInvoked = false; } + @Override public boolean postUnmarshalInvoked(Ice.Current current) { return _postUnmarshalInvoked; } + @Override public void ice_preMarshal() { preMarshalInvoked = true; } + @Override public void ice_postUnmarshal() { diff --git a/java/test/Ice/objects/CI.java b/java/test/Ice/objects/CI.java index 82261e1342d..f46501a241c 100644 --- a/java/test/Ice/objects/CI.java +++ b/java/test/Ice/objects/CI.java @@ -20,18 +20,21 @@ public final class CI extends C _postUnmarshalInvoked = false; } + @Override public boolean postUnmarshalInvoked(Ice.Current current) { return _postUnmarshalInvoked; } + @Override public void ice_preMarshal() { preMarshalInvoked = true; } + @Override public void ice_postUnmarshal() { diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java index a7f29457ed1..3d9f3803bc5 100644 --- a/java/test/Ice/objects/Client.java +++ b/java/test/Ice/objects/Client.java @@ -15,6 +15,7 @@ public class Client extends test.Util.Application { private static class MyObjectFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { if(type.equals("::Test::B")) @@ -54,12 +55,14 @@ public class Client extends test.Util.Application return null; } + @Override public void destroy() { // Nothing to do } } + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -78,6 +81,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java index b5a09a1475a..06d1f4bf5fd 100644 --- a/java/test/Ice/objects/Collocated.java +++ b/java/test/Ice/objects/Collocated.java @@ -15,6 +15,7 @@ public class Collocated extends test.Util.Application { private static class MyObjectFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { if(type.equals("::Test::B")) @@ -54,12 +55,14 @@ public class Collocated extends test.Util.Application return null; } + @Override public void destroy() { // Nothing to do } } + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -86,6 +89,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/objects/DI.java b/java/test/Ice/objects/DI.java index c66669bcc55..660efcd277c 100644 --- a/java/test/Ice/objects/DI.java +++ b/java/test/Ice/objects/DI.java @@ -20,18 +20,21 @@ public final class DI extends D _postUnmarshalInvoked = false; } + @Override public boolean postUnmarshalInvoked(Ice.Current current) { return _postUnmarshalInvoked; } + @Override public void ice_preMarshal() { preMarshalInvoked = true; } + @Override public void ice_postUnmarshal() { diff --git a/java/test/Ice/objects/EI.java b/java/test/Ice/objects/EI.java index d72e7ce0551..e4930e1644d 100644 --- a/java/test/Ice/objects/EI.java +++ b/java/test/Ice/objects/EI.java @@ -20,6 +20,7 @@ public final class EI extends E super(1, "hello"); } + @Override public boolean checkValues(Ice.Current current) { diff --git a/java/test/Ice/objects/FI.java b/java/test/Ice/objects/FI.java index a86a69cff52..d51461c8031 100644 --- a/java/test/Ice/objects/FI.java +++ b/java/test/Ice/objects/FI.java @@ -26,6 +26,7 @@ public final class FI extends F super(e, e); } + @Override public boolean checkValues(Ice.Current current) { diff --git a/java/test/Ice/objects/InitialI.java b/java/test/Ice/objects/InitialI.java index 6aab2cc1967..2678d597cce 100644 --- a/java/test/Ice/objects/InitialI.java +++ b/java/test/Ice/objects/InitialI.java @@ -53,6 +53,7 @@ public final class InitialI extends Initial _d.theC = null; // Reference to a C. } + @Override public void getAll(BHolder b1, BHolder b2, CHolder c, DHolder d, Ice.Current current) { @@ -66,6 +67,7 @@ public final class InitialI extends Initial d.value = _d; } + @Override public B getB1(Ice.Current current) { @@ -75,6 +77,7 @@ public final class InitialI extends Initial return _b1; } + @Override public B getB2(Ice.Current current) { @@ -84,6 +87,7 @@ public final class InitialI extends Initial return _b2; } + @Override public C getC(Ice.Current current) { @@ -93,6 +97,7 @@ public final class InitialI extends Initial return _c; } + @Override public D getD(Ice.Current current) { @@ -103,41 +108,48 @@ public final class InitialI extends Initial return _d; } + @Override public E getE(Ice.Current current) { return _e; } + @Override public F getF(Ice.Current current) { return _f; } + @Override public I getI(Ice.Current current) { return new II(); } + @Override public I getJ(Ice.Current current) { return new JI(); } + @Override public I getH(Ice.Current current) { return new HI(); } + @Override public void setI(I theI, Ice.Current current) { } + @Override public Base[] opBaseSeq(Base[] inS, BaseSeqHolder outS, Ice.Current current) { @@ -145,12 +157,14 @@ public final class InitialI extends Initial return inS; } + @Override public Compact getCompact(Ice.Current current) { return new CompactExt(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java index 8a6435880d8..d327e7d5b53 100644 --- a/java/test/Ice/objects/Server.java +++ b/java/test/Ice/objects/Server.java @@ -13,6 +13,7 @@ public class Server extends test.Util.Application { private static class MyObjectFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { if(type.equals("::Test::I")) @@ -32,12 +33,14 @@ public class Server extends test.Util.Application return null; } + @Override public void destroy() { // Nothing to do } } + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -56,6 +59,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java b/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java index 5c6af83b1e9..f9b0e8deb7a 100644 --- a/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java +++ b/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java @@ -15,6 +15,7 @@ import test.Ice.objects.Test.AlsoEmptyHelper; public final class UnexpectedObjectExceptionTestI extends Ice.Blobject { + @Override public boolean ice_invoke(byte[] inParams, Ice.ByteSeqHolder outParams, Ice.Current current) { diff --git a/java/test/Ice/operations/AMDMyDerivedClassI.java b/java/test/Ice/operations/AMDMyDerivedClassI.java index 6314a29df45..f577db345c1 100644 --- a/java/test/Ice/operations/AMDMyDerivedClassI.java +++ b/java/test/Ice/operations/AMDMyDerivedClassI.java @@ -71,6 +71,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass _cb = cb; } + @Override public void run() { @@ -84,6 +85,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass // Override the Object "pseudo" operations to verify the operation mode. // + @Override public boolean ice_isA(String id, Ice.Current current) { @@ -91,6 +93,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass return super.ice_isA(id, current); } + @Override public void ice_ping(Ice.Current current) { @@ -98,6 +101,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass super.ice_ping(current); } + @Override public String[] ice_ids(Ice.Current current) { @@ -105,6 +109,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass return super.ice_ids(current); } + @Override public String ice_id(Ice.Current current) { @@ -112,6 +117,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass return super.ice_id(current); } + @Override synchronized public void shutdown_async(AMD_MyClass_shutdown cb, Ice.Current current) @@ -132,6 +138,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override public void delay_async(AMD_MyClass_delay cb, int ms, Ice.Current current) { @@ -145,6 +152,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override synchronized public void opVoid_async(AMD_MyClass_opVoid cb, Ice.Current current) @@ -167,6 +175,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass _opVoidThread.start(); } + @Override public void opBool_async(AMD_MyClass_opBool cb, boolean p1, boolean p2, @@ -175,6 +184,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p2, p1); } + @Override public void opBoolS_async(AMD_MyClass_opBoolS cb, boolean[] p1, boolean[] p2, @@ -192,6 +202,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opBoolSS_async(AMD_MyClass_opBoolSS cb, boolean[][] p1, boolean[][] p2, @@ -209,6 +220,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opByte_async(AMD_MyClass_opByte cb, byte p1, byte p2, @@ -217,6 +229,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p1, (byte)(p1 ^ p2)); } + @Override public void opByteBoolD_async(AMD_MyClass_opByteBoolD cb, java.util.Map<Byte, Boolean> p1, java.util.Map<Byte, Boolean> p2, @@ -229,6 +242,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opByteS_async(AMD_MyClass_opByteS cb, byte[] p1, byte[] p2, @@ -246,6 +260,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opByteSS_async(AMD_MyClass_opByteSS cb, byte[][] p1, byte[][] p2, @@ -263,6 +278,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opFloatDouble_async(AMD_MyClass_opFloatDouble cb, float p1, double p2, @@ -271,6 +287,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p2, p1, p2); } + @Override public void opFloatDoubleS_async(AMD_MyClass_opFloatDoubleS cb, float[] p1, double[] p2, @@ -291,6 +308,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3, p4); } + @Override public void opFloatDoubleSS_async(AMD_MyClass_opFloatDoubleSS cb, float[][] p1, double[][] p2, @@ -308,6 +326,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3, p4); } + @Override public void opLongFloatD_async(AMD_MyClass_opLongFloatD cb, java.util.Map<Long, Float> p1, java.util.Map<Long, Float> p2, @@ -320,6 +339,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opMyClass_async(AMD_MyClass_opMyClass cb, MyClassPrx p1, @@ -331,6 +351,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3); } + @Override public void opMyEnum_async(AMD_MyClass_opMyEnum cb, MyEnum p1, @@ -339,6 +360,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(MyEnum.enum3, p1); } + @Override public void opShortIntD_async(AMD_MyClass_opShortIntD cb, java.util.Map<Short, Integer> p1, java.util.Map<Short, Integer> p2, @@ -351,6 +373,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opShortIntLong_async(AMD_MyClass_opShortIntLong cb, short p1, int p2, long p3, @@ -359,6 +382,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p3, p1, p2, p3); } + @Override public void opShortIntLongS_async(AMD_MyClass_opShortIntLongS cb, short[] p1, int[] p2, long[] p3, @@ -376,6 +400,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p3, p4, p5, p6); } + @Override public void opShortIntLongSS_async(AMD_MyClass_opShortIntLongSS cb, short[][] p1, int[][] p2, long[][] p3, @@ -393,6 +418,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p3, p4, p5, p6); } + @Override public void opString_async(AMD_MyClass_opString cb, String p1, String p2, @@ -401,6 +427,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p1 + " " + p2, p2 + " " + p1); } + @Override public void opStringMyEnumD_async(AMD_MyClass_opStringMyEnumD cb, java.util.Map<String, MyEnum> p1, java.util.Map<String, MyEnum> p2, @@ -413,6 +440,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opMyEnumStringD_async(AMD_MyClass_opMyEnumStringD cb, java.util.Map<MyEnum, String> p1, java.util.Map<MyEnum, String> p2, @@ -425,6 +453,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opMyStructMyEnumD_async(AMD_MyClass_opMyStructMyEnumD cb, java.util.Map<MyStruct, MyEnum> p1, java.util.Map<MyStruct, MyEnum> p2, @@ -437,6 +466,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opIntS_async(AMD_MyClass_opIntS cb, int[] s, Ice.Current current) { @@ -448,18 +478,21 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r); } + @Override public void opByteSOneway_async(AMD_MyClass_opByteSOneway cb, byte[] s, Ice.Current current) { cb.ice_response(); } + @Override public void opContext_async(AMD_MyClass_opContext cb, Ice.Current current) { cb.ice_response(current.ctx); } + @Override public void opDoubleMarshaling_async(AMD_MyClass_opDoubleMarshaling cb, double p1, double[] p2, Ice.Current current) { @@ -472,6 +505,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override public void opStringS_async(AMD_MyClass_opStringS cb, String[] p1, String[] p2, @@ -489,6 +523,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opStringSS_async(AMD_MyClass_opStringSS cb, String[][] p1, String[][] p2, @@ -506,6 +541,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opStringSSS_async(AMD_MyClass_opStringSSS cb, String[][][] p1, String[][][] p2, @@ -523,6 +559,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opStringStringD_async(AMD_MyClass_opStringStringD cb, java.util.Map<String, String> p1, java.util.Map<String, String> p2, @@ -535,6 +572,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opStruct_async(AMD_MyClass_opStruct cb, Structure p1, Structure p2, @@ -545,6 +583,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p2, p3); } + @Override public void opIdempotent_async(AMD_MyClass_opIdempotent cb, Ice.Current current) @@ -553,6 +592,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override public void opNonmutating_async(AMD_MyClass_opNonmutating cb, Ice.Current current) @@ -561,6 +601,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override public void opDerived_async(AMD_MyDerivedClass_opDerived cb, Ice.Current current) diff --git a/java/test/Ice/operations/AMDServer.java b/java/test/Ice/operations/AMDServer.java index 5c9499a7628..063af513e84 100644 --- a/java/test/Ice/operations/AMDServer.java +++ b/java/test/Ice/operations/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.operations; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -20,6 +21,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/AMDTieMyDerivedClassI.java b/java/test/Ice/operations/AMDTieMyDerivedClassI.java index fc285192c46..8d2e26b48d1 100644 --- a/java/test/Ice/operations/AMDTieMyDerivedClassI.java +++ b/java/test/Ice/operations/AMDTieMyDerivedClassI.java @@ -47,7 +47,6 @@ import test.Ice.operations.AMD.Test.AMD_MyClass_delay; import test.Ice.operations.AMD.Test.AMD_MyDerivedClass_opDerived; import test.Ice.operations.AMD.Test.MyClassPrx; import test.Ice.operations.AMD.Test.MyClassPrxHelper; -import test.Ice.operations.AMD.Test.MyDerivedClass; import test.Ice.operations.AMD.Test._MyDerivedClassOperations; import test.Ice.operations.AMD.Test.MyEnum; import test.Ice.operations.AMD.Test.MyStruct; @@ -72,6 +71,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations _cb = cb; } + @Override public void run() { @@ -81,6 +81,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations private AMD_MyClass_opVoid _cb; } + @Override synchronized public void shutdown_async(AMD_MyClass_shutdown cb, Ice.Current current) @@ -101,6 +102,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(); } + @Override public void delay_async(AMD_MyClass_delay cb, int ms, Ice.Current current) { @@ -114,6 +116,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(); } + @Override synchronized public void opVoid_async(AMD_MyClass_opVoid cb, Ice.Current current) @@ -136,6 +139,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations _opVoidThread.start(); } + @Override public void opBool_async(AMD_MyClass_opBool cb, boolean p1, boolean p2, @@ -144,6 +148,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p2, p1); } + @Override public void opBoolS_async(AMD_MyClass_opBoolS cb, boolean[] p1, boolean[] p2, @@ -161,6 +166,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opBoolSS_async(AMD_MyClass_opBoolSS cb, boolean[][] p1, boolean[][] p2, @@ -178,6 +184,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opByte_async(AMD_MyClass_opByte cb, byte p1, byte p2, @@ -186,6 +193,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p1, (byte)(p1 ^ p2)); } + @Override public void opByteBoolD_async(AMD_MyClass_opByteBoolD cb, java.util.Map<Byte, Boolean> p1, java.util.Map<Byte, Boolean> p2, @@ -198,6 +206,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opByteS_async(AMD_MyClass_opByteS cb, byte[] p1, byte[] p2, @@ -215,6 +224,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opByteSS_async(AMD_MyClass_opByteSS cb, byte[][] p1, byte[][] p2, @@ -232,6 +242,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opFloatDouble_async(AMD_MyClass_opFloatDouble cb, float p1, double p2, @@ -240,6 +251,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p2, p1, p2); } + @Override public void opFloatDoubleS_async(AMD_MyClass_opFloatDoubleS cb, float[] p1, double[] p2, @@ -260,6 +272,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3, p4); } + @Override public void opFloatDoubleSS_async(AMD_MyClass_opFloatDoubleSS cb, float[][] p1, double[][] p2, @@ -277,6 +290,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3, p4); } + @Override public void opLongFloatD_async(AMD_MyClass_opLongFloatD cb, java.util.Map<Long, Float> p1, java.util.Map<Long, Float> p2, @@ -289,6 +303,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opMyClass_async(AMD_MyClass_opMyClass cb, MyClassPrx p1, @@ -300,6 +315,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3); } + @Override public void opMyEnum_async(AMD_MyClass_opMyEnum cb, MyEnum p1, @@ -308,6 +324,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(MyEnum.enum3, p1); } + @Override public void opShortIntD_async(AMD_MyClass_opShortIntD cb, java.util.Map<Short, Integer> p1, java.util.Map<Short, Integer> p2, @@ -320,6 +337,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opShortIntLong_async(AMD_MyClass_opShortIntLong cb, short p1, int p2, long p3, @@ -328,6 +346,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p3, p1, p2, p3); } + @Override public void opShortIntLongS_async(AMD_MyClass_opShortIntLongS cb, short[] p1, int[] p2, long[] p3, @@ -345,6 +364,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p3, p4, p5, p6); } + @Override public void opShortIntLongSS_async(AMD_MyClass_opShortIntLongSS cb, short[][] p1, int[][] p2, long[][] p3, @@ -362,6 +382,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p3, p4, p5, p6); } + @Override public void opString_async(AMD_MyClass_opString cb, String p1, String p2, @@ -370,6 +391,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p1 + " " + p2, p2 + " " + p1); } + @Override public void opStringMyEnumD_async(AMD_MyClass_opStringMyEnumD cb, java.util.Map<String, MyEnum> p1, java.util.Map<String, MyEnum> p2, @@ -382,6 +404,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opMyEnumStringD_async(AMD_MyClass_opMyEnumStringD cb, java.util.Map<MyEnum, String> p1, java.util.Map<MyEnum, String> p2, @@ -394,6 +417,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opMyStructMyEnumD_async(AMD_MyClass_opMyStructMyEnumD cb, java.util.Map<MyStruct, MyEnum> p1, java.util.Map<MyStruct, MyEnum> p2, @@ -406,6 +430,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opIntS_async(AMD_MyClass_opIntS cb, int[] s, Ice.Current current) { @@ -417,18 +442,21 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r); } + @Override public void opByteSOneway_async(AMD_MyClass_opByteSOneway cb, byte[] s, Ice.Current current) { cb.ice_response(); } + @Override public void opContext_async(AMD_MyClass_opContext cb, Ice.Current current) { cb.ice_response(current.ctx); } + @Override public void opDoubleMarshaling_async(AMD_MyClass_opDoubleMarshaling cb, double p1, double[] p2, Ice.Current current) { @@ -441,6 +469,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(); } + @Override public void opStringS_async(AMD_MyClass_opStringS cb, String[] p1, String[] p2, @@ -458,6 +487,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opStringSS_async(AMD_MyClass_opStringSS cb, String[][] p1, String[][] p2, @@ -475,6 +505,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opStringSSS_async(AMD_MyClass_opStringSSS cb, String[][][] p1, String[][][] p2, @@ -492,6 +523,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opStringStringD_async(AMD_MyClass_opStringStringD cb, java.util.Map<String, String> p1, java.util.Map<String, String> p2, @@ -504,6 +536,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opStruct_async(AMD_MyClass_opStruct cb, Structure p1, Structure p2, @@ -514,6 +547,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p2, p3); } + @Override public void opIdempotent_async(AMD_MyClass_opIdempotent cb, Ice.Current current) @@ -522,6 +556,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(); } + @Override public void opNonmutating_async(AMD_MyClass_opNonmutating cb, Ice.Current current) @@ -530,6 +565,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(); } + @Override public void opDerived_async(AMD_MyDerivedClass_opDerived cb, Ice.Current current) diff --git a/java/test/Ice/operations/AMDTieServer.java b/java/test/Ice/operations/AMDTieServer.java index 82f69f5e35a..af88539eb00 100644 --- a/java/test/Ice/operations/AMDTieServer.java +++ b/java/test/Ice/operations/AMDTieServer.java @@ -13,6 +13,7 @@ import test.Ice.operations.AMD.Test._MyDerivedClassTie; public class AMDTieServer extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -22,6 +23,7 @@ public class AMDTieServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java index ed4ef912ac6..2c957a13e34 100644 --- a/java/test/Ice/operations/Client.java +++ b/java/test/Ice/operations/Client.java @@ -13,6 +13,7 @@ import test.Ice.operations.Test.MyClassPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { java.io.PrintWriter out = getWriter(); @@ -34,6 +35,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java index 451b098cd64..c34d07d5f11 100644 --- a/java/test/Ice/operations/Collocated.java +++ b/java/test/Ice/operations/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.operations; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -29,6 +30,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java index 9c13c03e4c8..5fddb73a3d5 100644 --- a/java/test/Ice/operations/MyDerivedClassI.java +++ b/java/test/Ice/operations/MyDerivedClassI.java @@ -58,6 +58,7 @@ public final class MyDerivedClassI extends MyDerivedClass // Override the Object "pseudo" operations to verify the operation mode. // + @Override public boolean ice_isA(String id, Ice.Current current) { @@ -65,6 +66,7 @@ public final class MyDerivedClassI extends MyDerivedClass return super.ice_isA(id, current); } + @Override public void ice_ping(Ice.Current current) { @@ -72,6 +74,7 @@ public final class MyDerivedClassI extends MyDerivedClass super.ice_ping(current); } + @Override public String[] ice_ids(Ice.Current current) { @@ -79,6 +82,7 @@ public final class MyDerivedClassI extends MyDerivedClass return super.ice_ids(current); } + @Override public String ice_id(Ice.Current current) { @@ -86,12 +90,14 @@ public final class MyDerivedClassI extends MyDerivedClass return super.ice_id(current); } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public void delay(int ms, Ice.Current current) { @@ -104,12 +110,14 @@ public final class MyDerivedClassI extends MyDerivedClass } } + @Override public void opVoid(Ice.Current current) { test(current.mode == Ice.OperationMode.Normal); } + @Override public boolean opBool(boolean p1, boolean p2, Ice.BooleanHolder p3, @@ -119,6 +127,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p2; } + @Override public boolean[] opBoolS(boolean[] p1, boolean[] p2, BoolSHolder p3, @@ -136,6 +145,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public boolean[][] opBoolSS(boolean[][] p1, boolean[][] p2, BoolSSHolder p3, @@ -153,6 +163,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public byte opByte(byte p1, byte p2, Ice.ByteHolder p3, @@ -162,6 +173,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p1; } + @Override public java.util.Map<Byte, Boolean> opByteBoolD(java.util.Map<Byte, Boolean> p1, java.util.Map<Byte, Boolean> p2, ByteBoolDHolder p3, Ice.Current current) @@ -173,6 +185,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public byte[] opByteS(byte[] p1, byte[] p2, ByteSHolder p3, @@ -190,6 +203,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public byte[][] opByteSS(byte[][] p1, byte[][] p2, ByteSSHolder p3, @@ -207,6 +221,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public double opFloatDouble(float p1, double p2, Ice.FloatHolder p3, Ice.DoubleHolder p4, @@ -217,6 +232,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p2; } + @Override public double[] opFloatDoubleS(float[] p1, double[] p2, FloatSHolder p3, DoubleSHolder p4, @@ -237,6 +253,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public double[][] opFloatDoubleSS(float[][] p1, double[][] p2, FloatSSHolder p3, DoubleSSHolder p4, @@ -254,6 +271,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public java.util.Map<Long, Float> opLongFloatD(java.util.Map<Long, Float> p1, java.util.Map<Long, Float> p2, LongFloatDHolder p3, Ice.Current current) @@ -265,6 +283,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public MyClassPrx opMyClass(MyClassPrx p1, MyClassPrxHolder p2, MyClassPrxHolder p3, @@ -276,6 +295,7 @@ public final class MyDerivedClassI extends MyDerivedClass return MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } + @Override public MyEnum opMyEnum(MyEnum p1, MyEnumHolder p2, @@ -285,6 +305,7 @@ public final class MyDerivedClassI extends MyDerivedClass return MyEnum.enum3; } + @Override public java.util.Map<Short, Integer> opShortIntD(java.util.Map<Short, Integer> p1, java.util.Map<Short, Integer> p2, ShortIntDHolder p3, Ice.Current current) @@ -296,6 +317,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public long opShortIntLong(short p1, int p2, long p3, Ice.ShortHolder p4, Ice.IntHolder p5, Ice.LongHolder p6, @@ -307,6 +329,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p3; } + @Override public long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, ShortSHolder p4, IntSHolder p5, LongSHolder p6, @@ -324,6 +347,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p3; } + @Override public long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, ShortSSHolder p4, IntSSHolder p5, LongSSHolder p6, @@ -341,6 +365,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p3; } + @Override public String opString(String p1, String p2, Ice.StringHolder p3, @@ -350,6 +375,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p1 + " " + p2; } + @Override public java.util.Map<String, MyEnum> opStringMyEnumD(java.util.Map<String, MyEnum> p1, java.util.Map<String, MyEnum> p2, StringMyEnumDHolder p3, Ice.Current current) @@ -361,6 +387,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public java.util.Map<MyEnum, String> opMyEnumStringD(java.util.Map<MyEnum, String> p1, java.util.Map<MyEnum, String> p2, MyEnumStringDHolder p3, Ice.Current current) @@ -372,6 +399,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public java.util.Map<MyStruct, MyEnum> opMyStructMyEnumD(java.util.Map<MyStruct, MyEnum> p1, java.util.Map<MyStruct, MyEnum> p2, MyStructMyEnumDHolder p3, Ice.Current current) @@ -383,6 +411,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public int[] opIntS(int[] s, Ice.Current current) { @@ -394,17 +423,20 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public void opByteSOneway(byte[] s, Ice.Current current) { } + @Override public java.util.Map<String, String> opContext(Ice.Current current) { return current.ctx; } + @Override public void opDoubleMarshaling(double p1, double[] p2, Ice.Current current) { @@ -416,6 +448,7 @@ public final class MyDerivedClassI extends MyDerivedClass } } + @Override public String[] opStringS(String[] p1, String[] p2, StringSHolder p3, @@ -433,6 +466,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public String[][] opStringSS(String[][] p1, String[][] p2, StringSSHolder p3, @@ -450,6 +484,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public String[][][] opStringSSS(String[][][] p1, String[][][] p2, StringSSSHolder p3, @@ -467,6 +502,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public java.util.Map<String, String> opStringStringD(java.util.Map<String, String> p1, java.util.Map<String, String> p2, StringStringDHolder p3, Ice.Current current) @@ -478,6 +514,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public Structure opStruct(Structure p1, Structure p2, StructureHolder p3, @@ -488,18 +525,21 @@ public final class MyDerivedClassI extends MyDerivedClass return p2; } + @Override public void opIdempotent(Ice.Current current) { test(current.mode == Ice.OperationMode.Idempotent); } + @Override public void opNonmutating(Ice.Current current) { test(current.mode == Ice.OperationMode.Nonmutating); } + @Override public void opDerived(Ice.Current current) { diff --git a/java/test/Ice/operations/Oneways.java b/java/test/Ice/operations/Oneways.java index 823213ca575..ded8ee39b3d 100644 --- a/java/test/Ice/operations/Oneways.java +++ b/java/test/Ice/operations/Oneways.java @@ -26,7 +26,6 @@ class Oneways static void oneways(test.Util.Application app, MyClassPrx p) { - Ice.Communicator communicator = app.communicator(); p = MyClassPrxHelper.uncheckedCast(p.ice_oneway()); { @@ -48,10 +47,9 @@ class Oneways { Ice.ByteHolder b = new Ice.ByteHolder(); - byte r; try { - r = p.opByte((byte)0xff, (byte)0x0f, b); + p.opByte((byte)0xff, (byte)0x0f, b); test(false); } catch(Ice.TwowayOnlyException ex) diff --git a/java/test/Ice/operations/OnewaysAMI.java b/java/test/Ice/operations/OnewaysAMI.java index 98316b3b509..9e2cbff880d 100644 --- a/java/test/Ice/operations/OnewaysAMI.java +++ b/java/test/Ice/operations/OnewaysAMI.java @@ -64,12 +64,14 @@ class OnewaysAMI private static class AMI_MyClass_opVoidI extends AMI_MyClass_opVoid { + @Override public void ice_response() { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -79,12 +81,14 @@ class OnewaysAMI private static class AMI_MyClass_opIdempotentI extends AMI_MyClass_opIdempotent { + @Override public void ice_response() { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -94,12 +98,14 @@ class OnewaysAMI private static class AMI_MyClass_opNonmutatingI extends AMI_MyClass_opNonmutating { + @Override public void ice_response() { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -109,12 +115,14 @@ class OnewaysAMI private static class AMI_MyClass_opVoidExI extends AMI_MyClass_opVoid { + @Override public void ice_response() { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -133,12 +141,14 @@ class OnewaysAMI private static class AMI_MyClass_opByteExI extends AMI_MyClass_opByte { + @Override public void ice_response(byte r, byte b) { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -158,7 +168,6 @@ class OnewaysAMI static void onewaysAMI(test.Util.Application app, MyClassPrx p) { - Ice.Communicator communicator = app.communicator(); p = MyClassPrxHelper.uncheckedCast(p.ice_oneway()); { diff --git a/java/test/Ice/operations/OnewaysNewAMI.java b/java/test/Ice/operations/OnewaysNewAMI.java index c5534a34a39..55f17e4f25e 100644 --- a/java/test/Ice/operations/OnewaysNewAMI.java +++ b/java/test/Ice/operations/OnewaysNewAMI.java @@ -12,11 +12,7 @@ package test.Ice.operations; import test.Ice.operations.Test.Callback_MyClass_opIdempotent; import test.Ice.operations.Test.Callback_MyClass_opNonmutating; import test.Ice.operations.Test.Callback_MyClass_opVoid; -import test.Ice.operations.Test.MyClass; import test.Ice.operations.Test.MyClassPrx; -import test.Ice.operations.Test.MyClassPrxHelper; -import test.Ice.operations.Test.Callback_MyClass_opVoid; -import test.Ice.operations.Test.Callback_MyClass_opByte; class OnewaysNewAMI { @@ -83,25 +79,27 @@ class OnewaysNewAMI static void onewaysNewAMI(test.Util.Application app, MyClassPrx proxy) { - Ice.Communicator communicator = app.communicator(); MyClassPrx p = (MyClassPrx)proxy.ice_oneway(); { final Callback cb = new Callback(); Ice.Callback_Object_ice_ping callback = new Ice.Callback_Object_ice_ping() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { cb.noException(ex); } + @Override public void sent(boolean sentSynchronously) { @@ -149,18 +147,21 @@ class OnewaysNewAMI final Callback cb = new Callback(); Callback_MyClass_opVoid callback = new Callback_MyClass_opVoid() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { cb.noException(ex); } + @Override public void sent(boolean sentSynchronously) { @@ -175,18 +176,21 @@ class OnewaysNewAMI final Callback cb = new Callback(); Callback_MyClass_opIdempotent callback = new Callback_MyClass_opIdempotent() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { cb.noException(ex); } + @Override public void sent(boolean sentSynchronously) { @@ -201,18 +205,21 @@ class OnewaysNewAMI final Callback cb = new Callback(); Callback_MyClass_opNonmutating callback = new Callback_MyClass_opNonmutating() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { cb.noException(ex); } + @Override public void sent(boolean sentSynchronously) { diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java index f88d09ccb3f..22dba1da02b 100644 --- a/java/test/Ice/operations/Server.java +++ b/java/test/Ice/operations/Server.java @@ -11,6 +11,7 @@ package test.Ice.operations; public class Server extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/TieMyDerivedClassI.java b/java/test/Ice/operations/TieMyDerivedClassI.java index 4903d5dc924..cbd7a833f15 100644 --- a/java/test/Ice/operations/TieMyDerivedClassI.java +++ b/java/test/Ice/operations/TieMyDerivedClassI.java @@ -26,7 +26,6 @@ import test.Ice.operations.Test.LongSSHolder; import test.Ice.operations.Test.MyClassPrx; import test.Ice.operations.Test.MyClassPrxHelper; import test.Ice.operations.Test.MyClassPrxHolder; -import test.Ice.operations.Test.MyDerivedClass; import test.Ice.operations.Test._MyDerivedClassOperations; import test.Ice.operations.Test.MyEnum; import test.Ice.operations.Test.MyEnumHolder; @@ -55,12 +54,14 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations } } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public void delay(int ms, Ice.Current current) { @@ -73,12 +74,14 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations } } + @Override public void opVoid(Ice.Current current) { test(current.mode == Ice.OperationMode.Normal); } + @Override public boolean opBool(boolean p1, boolean p2, Ice.BooleanHolder p3, @@ -88,6 +91,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p2; } + @Override public boolean[] opBoolS(boolean[] p1, boolean[] p2, BoolSHolder p3, @@ -105,6 +109,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public boolean[][] opBoolSS(boolean[][] p1, boolean[][] p2, BoolSSHolder p3, @@ -122,6 +127,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public byte opByte(byte p1, byte p2, Ice.ByteHolder p3, @@ -131,6 +137,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p1; } + @Override public java.util.Map<Byte, Boolean> opByteBoolD(java.util.Map<Byte, Boolean> p1, java.util.Map<Byte, Boolean> p2, ByteBoolDHolder p3, Ice.Current current) @@ -142,6 +149,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public byte[] opByteS(byte[] p1, byte[] p2, ByteSHolder p3, @@ -159,6 +167,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public byte[][] opByteSS(byte[][] p1, byte[][] p2, ByteSSHolder p3, @@ -176,6 +185,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public double opFloatDouble(float p1, double p2, Ice.FloatHolder p3, Ice.DoubleHolder p4, @@ -186,6 +196,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p2; } + @Override public double[] opFloatDoubleS(float[] p1, double[] p2, FloatSHolder p3, DoubleSHolder p4, @@ -206,6 +217,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public double[][] opFloatDoubleSS(float[][] p1, double[][] p2, FloatSSHolder p3, DoubleSSHolder p4, @@ -223,6 +235,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public java.util.Map<Long, Float> opLongFloatD(java.util.Map<Long, Float> p1, java.util.Map<Long, Float> p2, LongFloatDHolder p3, Ice.Current current) @@ -234,6 +247,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public MyClassPrx opMyClass(MyClassPrx p1, MyClassPrxHolder p2, MyClassPrxHolder p3, @@ -245,6 +259,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } + @Override public MyEnum opMyEnum(MyEnum p1, MyEnumHolder p2, @@ -254,6 +269,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return MyEnum.enum3; } + @Override public java.util.Map<Short, Integer> opShortIntD(java.util.Map<Short, Integer> p1, java.util.Map<Short, Integer> p2, ShortIntDHolder p3, Ice.Current current) @@ -265,6 +281,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public long opShortIntLong(short p1, int p2, long p3, Ice.ShortHolder p4, Ice.IntHolder p5, Ice.LongHolder p6, @@ -276,6 +293,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p3; } + @Override public long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, ShortSHolder p4, IntSHolder p5, LongSHolder p6, @@ -293,6 +311,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p3; } + @Override public long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, ShortSSHolder p4, IntSSHolder p5, LongSSHolder p6, @@ -310,6 +329,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p3; } + @Override public String opString(String p1, String p2, Ice.StringHolder p3, @@ -319,6 +339,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p1 + " " + p2; } + @Override public java.util.Map<String, MyEnum> opStringMyEnumD(java.util.Map<String, MyEnum> p1, java.util.Map<String, MyEnum> p2, StringMyEnumDHolder p3, Ice.Current current) @@ -330,6 +351,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public java.util.Map<MyEnum, String> opMyEnumStringD(java.util.Map<MyEnum, String> p1, java.util.Map<MyEnum, String> p2, MyEnumStringDHolder p3, Ice.Current current) @@ -341,6 +363,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public java.util.Map<MyStruct, MyEnum> opMyStructMyEnumD(java.util.Map<MyStruct, MyEnum> p1, java.util.Map<MyStruct, MyEnum> p2, MyStructMyEnumDHolder p3, Ice.Current current) @@ -352,6 +375,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public int[] opIntS(int[] s, Ice.Current current) { @@ -363,17 +387,20 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public void opByteSOneway(byte[] s, Ice.Current current) { } + @Override public java.util.Map<String, String> opContext(Ice.Current current) { return current.ctx; } + @Override public void opDoubleMarshaling(double p1, double[] p2, Ice.Current current) { @@ -385,6 +412,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations } } + @Override public String[] opStringS(String[] p1, String[] p2, StringSHolder p3, @@ -402,6 +430,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public String[][] opStringSS(String[][] p1, String[][] p2, StringSSHolder p3, @@ -419,6 +448,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public String[][][] opStringSSS(String[][][] p1, String[][][] p2, StringSSSHolder p3, @@ -436,6 +466,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public java.util.Map<String, String> opStringStringD(java.util.Map<String, String> p1, java.util.Map<String, String> p2, StringStringDHolder p3, Ice.Current current) @@ -447,6 +478,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public Structure opStruct(Structure p1, Structure p2, StructureHolder p3, @@ -457,18 +489,21 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p2; } + @Override public void opIdempotent(Ice.Current current) { test(current.mode == Ice.OperationMode.Idempotent); } + @Override public void opNonmutating(Ice.Current current) { test(current.mode == Ice.OperationMode.Nonmutating); } + @Override public void opDerived(Ice.Current current) { diff --git a/java/test/Ice/operations/TieServer.java b/java/test/Ice/operations/TieServer.java index 65e4cdc3b49..26bbdc7b7b5 100644 --- a/java/test/Ice/operations/TieServer.java +++ b/java/test/Ice/operations/TieServer.java @@ -13,6 +13,7 @@ import test.Ice.operations.Test._MyDerivedClassTie; public class TieServer extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -22,6 +23,7 @@ public class TieServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java index a8841c774fa..324238d7715 100644 --- a/java/test/Ice/operations/Twoways.java +++ b/java/test/Ice/operations/Twoways.java @@ -61,6 +61,7 @@ class Twoways _proxy = proxy; } + @Override public void run() { diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java index d9d4aaa8d0b..9e87fd0d3dd 100644 --- a/java/test/Ice/operations/TwowaysAMI.java +++ b/java/test/Ice/operations/TwowaysAMI.java @@ -98,12 +98,14 @@ class TwowaysAMI private static class AMI_MyClass_opVoidI extends AMI_MyClass_opVoid { + @Override public void ice_response() { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -121,12 +123,14 @@ class TwowaysAMI private static class AMI_MyClass_opVoidExI extends AMI_MyClass_opVoid { + @Override public void ice_response() { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -145,6 +149,7 @@ class TwowaysAMI private static class AMI_MyClass_opByteI extends AMI_MyClass_opByte { + @Override public void ice_response(byte r, byte b) { @@ -153,6 +158,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -170,12 +176,14 @@ class TwowaysAMI private static class AMI_MyClass_opByteExI extends AMI_MyClass_opByte { + @Override public void ice_response(byte r, byte b) { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -194,6 +202,7 @@ class TwowaysAMI private static class AMI_MyClass_opBoolI extends AMI_MyClass_opBool { + @Override public void ice_response(boolean r, boolean b) { @@ -202,6 +211,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -219,6 +229,7 @@ class TwowaysAMI private static class AMI_MyClass_opShortIntLongI extends AMI_MyClass_opShortIntLong { + @Override public void ice_response(long r, short s, int i, long l) { @@ -229,6 +240,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -246,6 +258,7 @@ class TwowaysAMI private static class AMI_MyClass_opFloatDoubleI extends AMI_MyClass_opFloatDouble { + @Override public void ice_response(double r, float f, double d) { @@ -255,6 +268,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -272,6 +286,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringI extends AMI_MyClass_opString { + @Override public void ice_response(String r, String s) { @@ -280,6 +295,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -297,6 +313,7 @@ class TwowaysAMI private static class AMI_MyClass_opMyEnumI extends AMI_MyClass_opMyEnum { + @Override public void ice_response(MyEnum r, MyEnum e) { @@ -305,6 +322,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -327,6 +345,7 @@ class TwowaysAMI _communicator = communicator; } + @Override public void ice_response(MyClassPrx r, MyClassPrx c1, MyClassPrx c2) { @@ -350,6 +369,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -373,6 +393,7 @@ class TwowaysAMI _communicator = communicator; } + @Override public void ice_response(Structure rso, Structure so) { @@ -389,6 +410,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -407,6 +429,7 @@ class TwowaysAMI private static class AMI_MyClass_opByteSI extends AMI_MyClass_opByteS { + @Override public void ice_response(byte[] rso, byte[] bso) { @@ -427,6 +450,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -444,6 +468,7 @@ class TwowaysAMI private static class AMI_MyClass_opBoolSI extends AMI_MyClass_opBoolS { + @Override public void ice_response(boolean[] rso, boolean[] bso) { @@ -459,6 +484,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -476,6 +502,7 @@ class TwowaysAMI private static class AMI_MyClass_opShortIntLongSI extends AMI_MyClass_opShortIntLongS { + @Override public void ice_response(long[] rso, short[] sso, int[] iso, long[] lso) @@ -503,6 +530,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -520,6 +548,7 @@ class TwowaysAMI private static class AMI_MyClass_opFloatDoubleSI extends AMI_MyClass_opFloatDoubleS { + @Override public void ice_response(double[] rso, float[] fso, double[] dso) { @@ -539,6 +568,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -556,6 +586,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringSI extends AMI_MyClass_opStringS { + @Override public void ice_response(String[] rso, String[] sso) { @@ -571,6 +602,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -588,6 +620,7 @@ class TwowaysAMI private static class AMI_MyClass_opByteSSI extends AMI_MyClass_opByteSS { + @Override public void ice_response(byte[][] rso, byte[][] bso) { @@ -613,6 +646,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -630,12 +664,14 @@ class TwowaysAMI private static class AMI_MyClass_opBoolSSI extends AMI_MyClass_opBoolSS { + @Override public void ice_response(boolean[][] rso, boolean[][] bso) { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -653,12 +689,14 @@ class TwowaysAMI private static class AMI_MyClass_opShortIntLongSSI extends AMI_MyClass_opShortIntLongSS { + @Override public void ice_response(long[][] rso, short[][] sso, int[][] iso, long[][] lso) { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -676,6 +714,7 @@ class TwowaysAMI private static class AMI_MyClass_opFloatDoubleSSI extends AMI_MyClass_opFloatDoubleSS { + @Override public void ice_response(double[][] rso, float[][] fso, double[][] dso) { @@ -702,6 +741,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -719,6 +759,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringSSI extends AMI_MyClass_opStringSS { + @Override public void ice_response(String[][] rso, String[][] sso) { @@ -740,6 +781,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -757,6 +799,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringSSSI extends AMI_MyClass_opStringSSS { + @Override public void ice_response(String[][][] rsso, String[][][] ssso) { @@ -795,6 +838,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -812,6 +856,7 @@ class TwowaysAMI private static class AMI_MyClass_opByteBoolDI extends AMI_MyClass_opByteBoolD { + @Override public void ice_response(java.util.Map<Byte, Boolean> ro, java.util.Map<Byte, Boolean> _do) { @@ -827,6 +872,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -844,6 +890,7 @@ class TwowaysAMI private static class AMI_MyClass_opShortIntDI extends AMI_MyClass_opShortIntD { + @Override public void ice_response(java.util.Map<Short, Integer> ro, java.util.Map<Short, Integer> _do) { @@ -859,6 +906,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -876,6 +924,7 @@ class TwowaysAMI private static class AMI_MyClass_opLongFloatDI extends AMI_MyClass_opLongFloatD { + @Override public void ice_response(java.util.Map<Long, Float> ro, java.util.Map<Long, Float> _do) { @@ -891,6 +940,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -908,6 +958,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringStringDI extends AMI_MyClass_opStringStringD { + @Override public void ice_response(java.util.Map<String, String> ro, java.util.Map<String, String> _do) { @@ -923,6 +974,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -940,6 +992,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringMyEnumDI extends AMI_MyClass_opStringMyEnumD { + @Override public void ice_response(java.util.Map<String, MyEnum> ro, java.util.Map<String, MyEnum> _do) { @@ -955,6 +1008,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -972,6 +1026,7 @@ class TwowaysAMI private static class AMI_MyClass_opMyEnumStringDI extends AMI_MyClass_opMyEnumStringD { + @Override public void ice_response(java.util.Map<MyEnum, String> ro, java.util.Map<MyEnum, String> _do) { @@ -985,6 +1040,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1002,6 +1058,7 @@ class TwowaysAMI private static class AMI_MyClass_opMyStructMyEnumDI extends AMI_MyClass_opMyStructMyEnumD { + @Override public void ice_response(java.util.Map<MyStruct, MyEnum> ro, java.util.Map<MyStruct, MyEnum> _do) { @@ -1021,6 +1078,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1043,6 +1101,7 @@ class TwowaysAMI _l = l; } + @Override public void ice_response(int[] r) { @@ -1054,6 +1113,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1077,6 +1137,7 @@ class TwowaysAMI _d = d; } + @Override public void ice_response(java.util.Map r) { @@ -1084,6 +1145,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1107,6 +1169,7 @@ class TwowaysAMI _d = d; } + @Override public void ice_response(java.util.Map r) { @@ -1114,6 +1177,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1132,12 +1196,14 @@ class TwowaysAMI private static class AMI_MyDerivedClass_opDerivedI extends AMI_MyDerivedClass_opDerived { + @Override public void ice_response() { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1155,12 +1221,14 @@ class TwowaysAMI private static class AMI_MyClass_opDoubleMarshalingI extends AMI_MyClass_opDoubleMarshaling { + @Override public void ice_response() { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1178,12 +1246,14 @@ class TwowaysAMI private static class AMI_MyClass_opIdempotentI extends AMI_MyClass_opIdempotent { + @Override public void ice_response() { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1201,12 +1271,14 @@ class TwowaysAMI private static class AMI_MyClass_opNonmutatingI extends AMI_MyClass_opNonmutating { + @Override public void ice_response() { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { diff --git a/java/test/Ice/operations/TwowaysNewAMI.java b/java/test/Ice/operations/TwowaysNewAMI.java index 6e64af6ac7e..b531673a00f 100644 --- a/java/test/Ice/operations/TwowaysNewAMI.java +++ b/java/test/Ice/operations/TwowaysNewAMI.java @@ -12,12 +12,10 @@ package test.Ice.operations; import test.Ice.operations.Test.Callback_MyClass_opVoid; import test.Ice.operations.Test.Callback_MyClass_opBool; import test.Ice.operations.Test.Callback_MyClass_opBoolS; -import test.Ice.operations.Test.Callback_MyClass_opBoolSS; import test.Ice.operations.Test.Callback_MyClass_opByte; import test.Ice.operations.Test.Callback_MyClass_opByteBoolD; import test.Ice.operations.Test.Callback_MyClass_opByteS; import test.Ice.operations.Test.Callback_MyClass_opByteSS; -import test.Ice.operations.Test.Callback_MyClass_opContext; import test.Ice.operations.Test.Callback_MyClass_opFloatDouble; import test.Ice.operations.Test.Callback_MyClass_opFloatDoubleS; import test.Ice.operations.Test.Callback_MyClass_opFloatDoubleSS; @@ -30,7 +28,6 @@ import test.Ice.operations.Test.Callback_MyClass_opNonmutating; import test.Ice.operations.Test.Callback_MyClass_opShortIntD; import test.Ice.operations.Test.Callback_MyClass_opShortIntLong; import test.Ice.operations.Test.Callback_MyClass_opShortIntLongS; -import test.Ice.operations.Test.Callback_MyClass_opShortIntLongSS; import test.Ice.operations.Test.Callback_MyClass_opString; import test.Ice.operations.Test.Callback_MyClass_opStringMyEnumD; import test.Ice.operations.Test.Callback_MyClass_opMyEnumStringD; @@ -656,50 +653,6 @@ class TwowaysNewAMI private Callback callback = new Callback(); } - private static class opBoolSSI extends Callback_MyClass_opBoolSS - { - @Override - public void response(boolean[][] rso, boolean[][] bso) - { - callback.called(); - } - - @Override - public void exception(Ice.LocalException ex) - { - test(false); - } - - public void check() - { - callback.check(); - } - - private Callback callback = new Callback(); - } - - private static class opShortIntLongSSI extends Callback_MyClass_opShortIntLongSS - { - @Override - public void response(long[][] rso, short[][] sso, int[][] iso, long[][] lso) - { - callback.called(); - } - - @Override - public void exception(Ice.LocalException ex) - { - test(false); - } - - public void check() - { - callback.check(); - } - - private Callback callback = new Callback(); - } - private static class opFloatDoubleSSI extends Callback_MyClass_opFloatDoubleSS { @Override diff --git a/java/test/Ice/optional/AMDInitialI.java b/java/test/Ice/optional/AMDInitialI.java index 988868711d0..224ebb5a1e4 100644 --- a/java/test/Ice/optional/AMDInitialI.java +++ b/java/test/Ice/optional/AMDInitialI.java @@ -13,6 +13,7 @@ import test.Ice.optional.AMD.Test.*; public final class AMDInitialI extends Initial { + @Override public void shutdown_async(AMD_Initial_shutdown cb, Ice.Current current) { @@ -20,12 +21,14 @@ public final class AMDInitialI extends Initial cb.ice_response(); } + @Override public void pingPong_async(AMD_Initial_pingPong cb, Ice.Object obj, Ice.Current current) { cb.ice_response(obj); } + @Override public void opOptionalException_async(AMD_Initial_opOptionalException cb, Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) @@ -51,6 +54,7 @@ public final class AMDInitialI extends Initial cb.ice_exception(ex); } + @Override public void opDerivedException_async(AMD_Initial_opDerivedException cb, Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) @@ -82,6 +86,7 @@ public final class AMDInitialI extends Initial cb.ice_exception(ex); } + @Override public void opRequiredException_async(AMD_Initial_opRequiredException cb, Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) @@ -109,168 +114,196 @@ public final class AMDInitialI extends Initial cb.ice_exception(ex); } + @Override public void opByte_async(AMD_Initial_opByte cb, Ice.ByteOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opByteReq_async(AMD_Initial_opByteReq cb, Ice.ByteOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opBool_async(AMD_Initial_opBool cb, Ice.BooleanOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opBoolReq_async(AMD_Initial_opBoolReq cb, Ice.BooleanOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opShort_async(AMD_Initial_opShort cb, Ice.ShortOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opShortReq_async(AMD_Initial_opShortReq cb, Ice.ShortOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opInt_async(AMD_Initial_opInt cb, Ice.IntOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opIntReq_async(AMD_Initial_opIntReq cb, Ice.IntOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opLong_async(AMD_Initial_opLong cb, Ice.LongOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opLongReq_async(AMD_Initial_opLongReq cb, Ice.LongOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opFloat_async(AMD_Initial_opFloat cb, Ice.FloatOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opFloatReq_async(AMD_Initial_opFloatReq cb, Ice.FloatOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opDouble_async(AMD_Initial_opDouble cb, Ice.DoubleOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opDoubleReq_async(AMD_Initial_opDoubleReq cb, Ice.DoubleOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opString_async(AMD_Initial_opString cb, Ice.Optional<String> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opStringReq_async(AMD_Initial_opStringReq cb, Ice.Optional<String> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opMyEnum_async(AMD_Initial_opMyEnum cb, Ice.Optional<MyEnum> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opMyEnumReq_async(AMD_Initial_opMyEnumReq cb, Ice.Optional<MyEnum> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opSmallStruct_async(AMD_Initial_opSmallStruct cb, Ice.Optional<SmallStruct> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opSmallStructReq_async(AMD_Initial_opSmallStructReq cb, Ice.Optional<SmallStruct> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opFixedStruct_async(AMD_Initial_opFixedStruct cb, Ice.Optional<FixedStruct> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opFixedStructReq_async(AMD_Initial_opFixedStructReq cb, Ice.Optional<FixedStruct> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opVarStruct_async(AMD_Initial_opVarStruct cb, Ice.Optional<VarStruct> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opVarStructReq_async(AMD_Initial_opVarStructReq cb, Ice.Optional<VarStruct> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opOneOptional_async(AMD_Initial_opOneOptional cb, Ice.Optional<OneOptional> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opOneOptionalReq_async(AMD_Initial_opOneOptionalReq cb, Ice.Optional<OneOptional> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opOneOptionalProxy_async(AMD_Initial_opOneOptionalProxy cb, Ice.Optional<OneOptionalPrx> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opOneOptionalProxyReq_async(AMD_Initial_opOneOptionalProxyReq cb, Ice.Optional<OneOptionalPrx> p1, Ice.Current current) @@ -278,114 +311,133 @@ public final class AMDInitialI extends Initial cb.ice_response(p1.get(), p1.get()); } + @Override public void opByteSeq_async(AMD_Initial_opByteSeq cb, Ice.Optional<byte[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opByteSeqReq_async(AMD_Initial_opByteSeqReq cb, Ice.Optional<byte[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opBoolSeq_async(AMD_Initial_opBoolSeq cb, Ice.Optional<boolean[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opBoolSeqReq_async(AMD_Initial_opBoolSeqReq cb, Ice.Optional<boolean[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opShortSeq_async(AMD_Initial_opShortSeq cb, Ice.Optional<short[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opShortSeqReq_async(AMD_Initial_opShortSeqReq cb, Ice.Optional<short[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opIntSeq_async(AMD_Initial_opIntSeq cb, Ice.Optional<int[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opIntSeqReq_async(AMD_Initial_opIntSeqReq cb, Ice.Optional<int[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opLongSeq_async(AMD_Initial_opLongSeq cb, Ice.Optional<long[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opLongSeqReq_async(AMD_Initial_opLongSeqReq cb, Ice.Optional<long[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opFloatSeq_async(AMD_Initial_opFloatSeq cb, Ice.Optional<float[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opFloatSeqReq_async(AMD_Initial_opFloatSeqReq cb, Ice.Optional<float[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opDoubleSeq_async(AMD_Initial_opDoubleSeq cb, Ice.Optional<double[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opDoubleSeqReq_async(AMD_Initial_opDoubleSeqReq cb, Ice.Optional<double[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opStringSeq_async(AMD_Initial_opStringSeq cb, Ice.Optional<String[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opStringSeqReq_async(AMD_Initial_opStringSeqReq cb, Ice.Optional<String[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opSmallStructSeq_async(AMD_Initial_opSmallStructSeq cb, Ice.Optional<SmallStruct[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opSmallStructSeqReq_async(AMD_Initial_opSmallStructSeqReq cb, Ice.Optional<SmallStruct[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opSmallStructList_async(AMD_Initial_opSmallStructList cb, Ice.Optional<java.util.List<SmallStruct>> p1, Ice.Current current) @@ -393,6 +445,7 @@ public final class AMDInitialI extends Initial cb.ice_response(p1, p1); } + @Override public void opSmallStructListReq_async(AMD_Initial_opSmallStructListReq cb, Ice.Optional<java.util.List<SmallStruct>> p1, Ice.Current current) @@ -400,18 +453,21 @@ public final class AMDInitialI extends Initial cb.ice_response(p1.get(), p1.get()); } + @Override public void opFixedStructSeq_async(AMD_Initial_opFixedStructSeq cb, Ice.Optional<FixedStruct[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opFixedStructSeqReq_async(AMD_Initial_opFixedStructSeqReq cb, Ice.Optional<FixedStruct[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opFixedStructList_async(AMD_Initial_opFixedStructList cb, Ice.Optional<java.util.List<FixedStruct>> p1, Ice.Current current) @@ -419,6 +475,7 @@ public final class AMDInitialI extends Initial cb.ice_response(p1, p1); } + @Override public void opFixedStructListReq_async(AMD_Initial_opFixedStructListReq cb, Ice.Optional<java.util.List<FixedStruct>> p1, Ice.Current current) @@ -426,30 +483,35 @@ public final class AMDInitialI extends Initial cb.ice_response(p1.get(), p1.get()); } + @Override public void opVarStructSeq_async(AMD_Initial_opVarStructSeq cb, Ice.Optional<VarStruct[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opVarStructSeqReq_async(AMD_Initial_opVarStructSeqReq cb, Ice.Optional<VarStruct[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opSerializable_async(AMD_Initial_opSerializable cb, Ice.Optional<SerializableClass> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opSerializableReq_async(AMD_Initial_opSerializableReq cb, Ice.Optional<SerializableClass> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opIntIntDict_async(AMD_Initial_opIntIntDict cb, Ice.Optional<java.util.Map<Integer, Integer>> p1, Ice.Current current) @@ -457,6 +519,7 @@ public final class AMDInitialI extends Initial cb.ice_response(p1, p1); } + @Override public void opIntIntDictReq_async(AMD_Initial_opIntIntDictReq cb, Ice.Optional<java.util.Map<Integer, Integer>> p1, Ice.Current current) @@ -464,6 +527,7 @@ public final class AMDInitialI extends Initial cb.ice_response(p1.get(), p1.get()); } + @Override public void opStringIntDict_async(AMD_Initial_opStringIntDict cb, Ice.Optional<java.util.Map<String, Integer>> p1, Ice.Current current) @@ -471,6 +535,7 @@ public final class AMDInitialI extends Initial cb.ice_response(p1, p1); } + @Override public void opStringIntDictReq_async(AMD_Initial_opStringIntDictReq cb, Ice.Optional<java.util.Map<String, Integer>> p1, Ice.Current current) @@ -478,12 +543,14 @@ public final class AMDInitialI extends Initial cb.ice_response(p1.get(), p1.get()); } + @Override public void opClassAndUnknownOptional_async(AMD_Initial_opClassAndUnknownOptional cb, A p, Ice.Current current) { cb.ice_response(); } + @Override public void sendOptionalClass_async(AMD_Initial_sendOptionalClass cb, boolean req, Ice.Optional<OneOptional> o, Ice.Current current) @@ -491,24 +558,28 @@ public final class AMDInitialI extends Initial cb.ice_response(); } + @Override public void returnOptionalClass_async(AMD_Initial_returnOptionalClass cb, boolean req, Ice.Current current) { cb.ice_response(new Ice.Optional<OneOptional>(new OneOptional(53))); } + @Override public void supportsRequiredParams_async(AMD_Initial_supportsRequiredParams cb, Ice.Current current) { cb.ice_response(true); } + @Override public void supportsJavaSerializable_async(AMD_Initial_supportsJavaSerializable cb, Ice.Current current) { cb.ice_response(true); } + @Override public void supportsCsharpSerializable_async(AMD_Initial_supportsCsharpSerializable cb, Ice.Current current) { diff --git a/java/test/Ice/optional/AMDServer.java b/java/test/Ice/optional/AMDServer.java index 8fc465ceb25..b05e5b28f3c 100644 --- a/java/test/Ice/optional/AMDServer.java +++ b/java/test/Ice/optional/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.optional; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -20,6 +21,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/optional/AllTests.java b/java/test/Ice/optional/AllTests.java index c3eb9bc7957..0665eec3252 100644 --- a/java/test/Ice/optional/AllTests.java +++ b/java/test/Ice/optional/AllTests.java @@ -508,6 +508,7 @@ public class AllTests final FHolder fholder = new FHolder(); in.readObject(new Ice.ReadObjectCallback() { + @Override public void invoke(Ice.Object obj) { fholder.value = ((FObjectReader)obj).getF(); @@ -2111,6 +2112,7 @@ public class AllTests final AHolder a = new AHolder(); in.readObject(new Ice.ReadObjectCallback() { + @Override public void invoke(Ice.Object obj) { a.value = (A)obj; @@ -2282,6 +2284,7 @@ public class AllTests private static class TestObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { in.startObject(); @@ -2293,6 +2296,7 @@ public class AllTests private static class BObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { in.startObject(); @@ -2310,6 +2314,7 @@ public class AllTests private static class CObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { in.startObject(); @@ -2330,12 +2335,12 @@ public class AllTests private static class DObjectWriter extends Ice.ObjectWriter { + @Override public void write(Ice.OutputStream out) { out.startObject(null); // ::Test::D out.startSlice("::Test::D", -1, false); - String s = "test"; out.writeString("test"); out.writeOptional(1, Ice.OptionalFormat.FSize); String[] o = { "test1", "test2", "test3", "test4" }; @@ -2362,6 +2367,7 @@ public class AllTests private static class DObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { in.startObject(); @@ -2398,6 +2404,7 @@ public class AllTests private static class FObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { _f = new F(); @@ -2409,6 +2416,7 @@ public class AllTests in.startSlice(); in.readObject(new Ice.ReadObjectCallback() { + @Override public void invoke(Ice.Object obj) { _f.ae = (A)obj; @@ -2428,6 +2436,7 @@ public class AllTests private static class FactoryI implements Ice.ObjectFactory { + @Override public Ice.Object create(String typeId) { if(!_enabled) @@ -2463,6 +2472,7 @@ public class AllTests return null; } + @Override public void destroy() { } @@ -2477,6 +2487,7 @@ public class AllTests private static class ReadObjectCallbackI implements Ice.ReadObjectCallback { + @Override public void invoke(Ice.Object obj) { this.obj = obj; diff --git a/java/test/Ice/optional/Client.java b/java/test/Ice/optional/Client.java index b9dbfc5a65b..22f05e262bc 100644 --- a/java/test/Ice/optional/Client.java +++ b/java/test/Ice/optional/Client.java @@ -13,6 +13,7 @@ import test.Ice.optional.Test.InitialPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { java.io.PrintWriter out = getWriter(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/optional/InitialI.java b/java/test/Ice/optional/InitialI.java index d7b8ec17a99..9bd9f400718 100644 --- a/java/test/Ice/optional/InitialI.java +++ b/java/test/Ice/optional/InitialI.java @@ -13,18 +13,21 @@ import test.Ice.optional.Test.*; public final class InitialI extends Initial { + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public Ice.Object pingPong(Ice.Object obj, Ice.Current current) { return obj; } + @Override public void opOptionalException(Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) throws OptionalException @@ -49,6 +52,7 @@ public final class InitialI extends Initial throw ex; } + @Override public void opDerivedException(Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) throws OptionalException @@ -79,6 +83,7 @@ public final class InitialI extends Initial throw ex; } + @Override public void opRequiredException(Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) throws OptionalException @@ -105,6 +110,7 @@ public final class InitialI extends Initial throw ex; } + @Override public Ice.ByteOptional opByte(Ice.ByteOptional p1, Ice.ByteOptional p3, Ice.Current current) { @@ -112,6 +118,7 @@ public final class InitialI extends Initial return p1; } + @Override public byte opByteReq(Ice.ByteOptional p1, Ice.ByteHolder p3, Ice.Current current) { @@ -119,6 +126,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.BooleanOptional opBool(Ice.BooleanOptional p1, Ice.BooleanOptional p3, Ice.Current current) { @@ -126,6 +134,7 @@ public final class InitialI extends Initial return p1; } + @Override public boolean opBoolReq(Ice.BooleanOptional p1, Ice.BooleanHolder p3, Ice.Current current) { @@ -133,6 +142,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.ShortOptional opShort(Ice.ShortOptional p1, Ice.ShortOptional p3, Ice.Current current) { @@ -140,6 +150,7 @@ public final class InitialI extends Initial return p1; } + @Override public short opShortReq(Ice.ShortOptional p1, Ice.ShortHolder p3, Ice.Current current) { @@ -147,6 +158,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.IntOptional opInt(Ice.IntOptional p1, Ice.IntOptional p3, Ice.Current current) { @@ -154,6 +166,7 @@ public final class InitialI extends Initial return p1; } + @Override public int opIntReq(Ice.IntOptional p1, Ice.IntHolder p3, Ice.Current current) { @@ -161,6 +174,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.LongOptional opLong(Ice.LongOptional p1, Ice.LongOptional p3, Ice.Current current) { @@ -168,6 +182,7 @@ public final class InitialI extends Initial return p1; } + @Override public long opLongReq(Ice.LongOptional p1, Ice.LongHolder p3, Ice.Current current) { @@ -175,6 +190,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.FloatOptional opFloat(Ice.FloatOptional p1, Ice.FloatOptional p3, Ice.Current current) { @@ -182,6 +198,7 @@ public final class InitialI extends Initial return p1; } + @Override public float opFloatReq(Ice.FloatOptional p1, Ice.FloatHolder p3, Ice.Current current) { @@ -189,6 +206,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.DoubleOptional opDouble(Ice.DoubleOptional p1, Ice.DoubleOptional p3, Ice.Current current) { @@ -196,6 +214,7 @@ public final class InitialI extends Initial return p1; } + @Override public double opDoubleReq(Ice.DoubleOptional p1, Ice.DoubleHolder p3, Ice.Current current) { @@ -203,6 +222,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<String> opString(Ice.Optional<String> p1, Ice.Optional<String> p3, Ice.Current current) { @@ -210,6 +230,7 @@ public final class InitialI extends Initial return p1; } + @Override public String opStringReq(Ice.Optional<String> p1, Ice.StringHolder p3, Ice.Current current) { @@ -217,6 +238,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<MyEnum> opMyEnum(Ice.Optional<MyEnum> p1, Ice.Optional<MyEnum> p3, Ice.Current current) { @@ -224,6 +246,7 @@ public final class InitialI extends Initial return p1; } + @Override public MyEnum opMyEnumReq(Ice.Optional<MyEnum> p1, MyEnumHolder p3, Ice.Current current) { @@ -231,6 +254,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<SmallStruct> opSmallStruct(Ice.Optional<SmallStruct> p1, Ice.Optional<SmallStruct> p3, Ice.Current current) { @@ -238,6 +262,7 @@ public final class InitialI extends Initial return p1; } + @Override public SmallStruct opSmallStructReq(Ice.Optional<SmallStruct> p1, SmallStructHolder p3, Ice.Current current) { @@ -245,6 +270,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<FixedStruct> opFixedStruct(Ice.Optional<FixedStruct> p1, Ice.Optional<FixedStruct> p3, Ice.Current current) { @@ -252,6 +278,7 @@ public final class InitialI extends Initial return p1; } + @Override public FixedStruct opFixedStructReq(Ice.Optional<FixedStruct> p1, FixedStructHolder p3, Ice.Current current) { @@ -259,6 +286,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<VarStruct> opVarStruct(Ice.Optional<VarStruct> p1, Ice.Optional<VarStruct> p3, Ice.Current current) { @@ -266,6 +294,7 @@ public final class InitialI extends Initial return p1; } + @Override public VarStruct opVarStructReq(Ice.Optional<VarStruct> p1, VarStructHolder p3, Ice.Current current) { @@ -273,6 +302,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<OneOptional> opOneOptional(Ice.Optional<OneOptional> p1, Ice.Optional<OneOptional> p3, Ice.Current current) { @@ -280,6 +310,7 @@ public final class InitialI extends Initial return p1; } + @Override public OneOptional opOneOptionalReq(Ice.Optional<OneOptional> p1, OneOptionalHolder p3, Ice.Current current) { @@ -287,6 +318,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<OneOptionalPrx> opOneOptionalProxy(Ice.Optional<OneOptionalPrx> p1, Ice.Optional<OneOptionalPrx> p3, Ice.Current current) { @@ -294,6 +326,7 @@ public final class InitialI extends Initial return p1; } + @Override public OneOptionalPrx opOneOptionalProxyReq(Ice.Optional<OneOptionalPrx> p1, OneOptionalPrxHolder p3, Ice.Current current) { @@ -301,6 +334,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<byte[]> opByteSeq(Ice.Optional<byte[]> p1, Ice.Optional<byte[]> p3, Ice.Current current) { @@ -308,6 +342,7 @@ public final class InitialI extends Initial return p1; } + @Override public byte[] opByteSeqReq(Ice.Optional<byte[]> p1, ByteSeqHolder p3, Ice.Current current) { @@ -315,6 +350,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<boolean[]> opBoolSeq(Ice.Optional<boolean[]> p1, Ice.Optional<boolean[]> p3, Ice.Current current) { @@ -322,6 +358,7 @@ public final class InitialI extends Initial return p1; } + @Override public boolean[] opBoolSeqReq(Ice.Optional<boolean[]> p1, BoolSeqHolder p3, Ice.Current current) { @@ -329,6 +366,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<short[]> opShortSeq(Ice.Optional<short[]> p1, Ice.Optional<short[]> p3, Ice.Current current) { @@ -336,6 +374,7 @@ public final class InitialI extends Initial return p1; } + @Override public short[] opShortSeqReq(Ice.Optional<short[]> p1, ShortSeqHolder p3, Ice.Current current) { @@ -343,6 +382,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<int[]> opIntSeq(Ice.Optional<int[]> p1, Ice.Optional<int[]> p3, Ice.Current current) { @@ -350,6 +390,7 @@ public final class InitialI extends Initial return p1; } + @Override public int[] opIntSeqReq(Ice.Optional<int[]> p1, IntSeqHolder p3, Ice.Current current) { @@ -357,6 +398,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<long[]> opLongSeq(Ice.Optional<long[]> p1, Ice.Optional<long[]> p3, Ice.Current current) { @@ -364,6 +406,7 @@ public final class InitialI extends Initial return p1; } + @Override public long[] opLongSeqReq(Ice.Optional<long[]> p1, LongSeqHolder p3, Ice.Current current) { @@ -371,6 +414,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<float[]> opFloatSeq(Ice.Optional<float[]> p1, Ice.Optional<float[]> p3, Ice.Current current) { @@ -378,6 +422,7 @@ public final class InitialI extends Initial return p1; } + @Override public float[] opFloatSeqReq(Ice.Optional<float[]> p1, FloatSeqHolder p3, Ice.Current current) { @@ -385,6 +430,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<double[]> opDoubleSeq(Ice.Optional<double[]> p1, Ice.Optional<double[]> p3, Ice.Current current) { @@ -392,6 +438,7 @@ public final class InitialI extends Initial return p1; } + @Override public double[] opDoubleSeqReq(Ice.Optional<double[]> p1, DoubleSeqHolder p3, Ice.Current current) { @@ -399,6 +446,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<String[]> opStringSeq(Ice.Optional<String[]> p1, Ice.Optional<String[]> p3, Ice.Current current) { @@ -406,6 +454,7 @@ public final class InitialI extends Initial return p1; } + @Override public String[] opStringSeqReq(Ice.Optional<String[]> p1, StringSeqHolder p3, Ice.Current current) { @@ -413,6 +462,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<SmallStruct[]> opSmallStructSeq(Ice.Optional<SmallStruct[]> p1, Ice.Optional<SmallStruct[]> p3, Ice.Current current) { @@ -420,6 +470,7 @@ public final class InitialI extends Initial return p1; } + @Override public SmallStruct[] opSmallStructSeqReq(Ice.Optional<SmallStruct[]> p1, SmallStructSeqHolder p3, Ice.Current current) { @@ -427,6 +478,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override 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) @@ -435,6 +487,7 @@ public final class InitialI extends Initial return p1; } + @Override public java.util.List<SmallStruct> opSmallStructListReq(Ice.Optional<java.util.List<SmallStruct>> p1, SmallStructListHolder p3, Ice.Current current) { @@ -442,6 +495,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<FixedStruct[]> opFixedStructSeq(Ice.Optional<FixedStruct[]> p1, Ice.Optional<FixedStruct[]> p3, Ice.Current current) { @@ -449,6 +503,7 @@ public final class InitialI extends Initial return p1; } + @Override public FixedStruct[] opFixedStructSeqReq(Ice.Optional<FixedStruct[]> p1, FixedStructSeqHolder p3, Ice.Current current) { @@ -456,6 +511,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override 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) @@ -464,6 +520,7 @@ public final class InitialI extends Initial return p1; } + @Override public java.util.List<FixedStruct> opFixedStructListReq(Ice.Optional<java.util.List<FixedStruct>> p1, FixedStructListHolder p3, Ice.Current current) { @@ -471,6 +528,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<VarStruct[]> opVarStructSeq(Ice.Optional<VarStruct[]> p1, Ice.Optional<VarStruct[]> p3, Ice.Current current) { @@ -478,6 +536,7 @@ public final class InitialI extends Initial return p1; } + @Override public VarStruct[] opVarStructSeqReq(Ice.Optional<VarStruct[]> p1, VarStructSeqHolder p3, Ice.Current current) { @@ -485,6 +544,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<SerializableClass> opSerializable(Ice.Optional<SerializableClass> p1, Ice.Optional<SerializableClass> p3, Ice.Current current) { @@ -492,6 +552,7 @@ public final class InitialI extends Initial return p1; } + @Override public SerializableClass opSerializableReq(Ice.Optional<SerializableClass> p1, Ice.Holder<SerializableClass> p3, Ice.Current current) { @@ -499,6 +560,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override 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) @@ -507,6 +569,7 @@ public final class InitialI extends Initial return p1; } + @Override public java.util.Map<Integer, Integer> opIntIntDictReq(Ice.Optional<java.util.Map<Integer, Integer>> p1, IntIntDictHolder p3, Ice.Current current) { @@ -514,6 +577,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override 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) @@ -522,6 +586,7 @@ public final class InitialI extends Initial return p1; } + @Override public java.util.Map<String, Integer> opStringIntDictReq(Ice.Optional<java.util.Map<String, Integer>> p1, StringIntDictHolder p3, Ice.Current current) { @@ -529,34 +594,40 @@ public final class InitialI extends Initial return p1.get(); } + @Override public void opClassAndUnknownOptional(A p, Ice.Current current) { } + @Override public void sendOptionalClass(boolean req, Ice.Optional<OneOptional> o, Ice.Current current) { } + @Override public void returnOptionalClass(boolean req, Ice.Optional<OneOptional> o, Ice.Current current) { o.set(new OneOptional(53)); } + @Override public boolean supportsRequiredParams(Ice.Current current) { return true; } + @Override public boolean supportsJavaSerializable(Ice.Current current) { return true; } + @Override public boolean supportsCsharpSerializable(Ice.Current current) { diff --git a/java/test/Ice/optional/SerializableClass.java b/java/test/Ice/optional/SerializableClass.java index 6314f57c3b9..1d29516c246 100644 --- a/java/test/Ice/optional/SerializableClass.java +++ b/java/test/Ice/optional/SerializableClass.java @@ -16,6 +16,7 @@ public class SerializableClass implements java.io.Serializable _v = v; } + @Override public boolean equals(Object obj) { if(obj instanceof SerializableClass) diff --git a/java/test/Ice/optional/Server.java b/java/test/Ice/optional/Server.java index 61e75f4b054..15446ac47b5 100644 --- a/java/test/Ice/optional/Server.java +++ b/java/test/Ice/optional/Server.java @@ -11,6 +11,7 @@ package test.Ice.optional; public class Server extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/packagemd/Client.java b/java/test/Ice/packagemd/Client.java index 2e6cc33d4da..8081a790e76 100644 --- a/java/test/Ice/packagemd/Client.java +++ b/java/test/Ice/packagemd/Client.java @@ -13,6 +13,7 @@ import test.Ice.packagemd.Test.InitialPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { InitialPrx initial = AllTests.allTests(communicator(), getWriter()); @@ -20,6 +21,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/packagemd/InitialI.java b/java/test/Ice/packagemd/InitialI.java index fd619e556b5..6d4d4fbaf96 100644 --- a/java/test/Ice/packagemd/InitialI.java +++ b/java/test/Ice/packagemd/InitialI.java @@ -24,18 +24,21 @@ public final class InitialI extends _InitialDisp return new C2(); } + @Override public C1 getTest1C2AsC1(Ice.Current __current) { return new C2(); } + @Override public C2 getTest1C2AsC2(Ice.Current __current) { return new C2(); } + @Override public void throwTest1E2AsE1(Ice.Current __current) throws E1 @@ -43,6 +46,7 @@ public final class InitialI extends _InitialDisp throw new E2(); } + @Override public void throwTest1E2AsE2(Ice.Current __current) throws E2 @@ -50,6 +54,7 @@ public final class InitialI extends _InitialDisp throw new E2(); } + @Override public void throwTest1Notify(Ice.Current __current) throws _notify @@ -63,18 +68,21 @@ public final class InitialI extends _InitialDisp return new test.Ice.packagemd.testpkg.Test2.C2(); } + @Override public test.Ice.packagemd.testpkg.Test2.C1 getTest2C2AsC1(Ice.Current __current) { return new test.Ice.packagemd.testpkg.Test2.C2(); } + @Override public test.Ice.packagemd.testpkg.Test2.C2 getTest2C2AsC2(Ice.Current __current) { return new test.Ice.packagemd.testpkg.Test2.C2(); } + @Override public void throwTest2E2AsE1(Ice.Current __current) throws test.Ice.packagemd.testpkg.Test2.E1 @@ -82,6 +90,7 @@ public final class InitialI extends _InitialDisp throw new test.Ice.packagemd.testpkg.Test2.E2(); } + @Override public void throwTest2E2AsE2(Ice.Current __current) throws test.Ice.packagemd.testpkg.Test2.E2 @@ -95,18 +104,21 @@ public final class InitialI extends _InitialDisp return new test.Ice.packagemd.testpkg.Test3.C2(); } + @Override public test.Ice.packagemd.testpkg.Test3.C1 getTest3C2AsC1(Ice.Current __current) { return new test.Ice.packagemd.testpkg.Test3.C2(); } + @Override public test.Ice.packagemd.testpkg.Test3.C2 getTest3C2AsC2(Ice.Current __current) { return new test.Ice.packagemd.testpkg.Test3.C2(); } + @Override public void throwTest3E2AsE1(Ice.Current __current) throws test.Ice.packagemd.testpkg.Test3.E1 @@ -114,6 +126,7 @@ public final class InitialI extends _InitialDisp throw new test.Ice.packagemd.testpkg.Test3.E2(); } + @Override public void throwTest3E2AsE2(Ice.Current __current) throws test.Ice.packagemd.testpkg.Test3.E2 @@ -121,6 +134,7 @@ public final class InitialI extends _InitialDisp throw new test.Ice.packagemd.testpkg.Test3.E2(); } + @Override public void shutdown(Ice.Current __current) { diff --git a/java/test/Ice/packagemd/Server.java b/java/test/Ice/packagemd/Server.java index 25c2cb300e4..61bbb0dd2c6 100644 --- a/java/test/Ice/packagemd/Server.java +++ b/java/test/Ice/packagemd/Server.java @@ -11,6 +11,7 @@ package test.Ice.packagemd; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/plugin/Client.java b/java/test/Ice/plugin/Client.java index 600b377da1d..096f8d18a35 100644 --- a/java/test/Ice/plugin/Client.java +++ b/java/test/Ice/plugin/Client.java @@ -13,6 +13,7 @@ import java.io.PrintWriter; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -146,6 +147,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); @@ -181,11 +183,13 @@ public class Client extends test.Util.Application return _destroyed; } + @Override public void initialize() { _initialized = true; } + @Override public void destroy() { _destroyed = true; diff --git a/java/test/Ice/plugin/plugins/PluginFactory.java b/java/test/Ice/plugin/plugins/PluginFactory.java index fb482d2b7ad..02e8ad76d7e 100644 --- a/java/test/Ice/plugin/plugins/PluginFactory.java +++ b/java/test/Ice/plugin/plugins/PluginFactory.java @@ -11,19 +11,20 @@ package test.Ice.plugin.plugins; public class PluginFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { - return new Plugin(communicator, args); + return new Plugin(args); } static class Plugin implements Ice.Plugin { - public Plugin(Ice.Communicator communicator, String[] args) + public Plugin(String[] args) { - _communicator = communicator; _args = args; } + @Override public void initialize() { _initialized = true; @@ -33,11 +34,13 @@ public class PluginFactory implements Ice.PluginFactory test(_args[2].equals("C:\\Program Files\\Application\\db")); } + @Override public void destroy() { _destroyed = true; } + @Override protected void finalize() throws Throwable { try @@ -65,7 +68,6 @@ public class PluginFactory implements Ice.PluginFactory } } - private Ice.Communicator _communicator; private String[] _args; private boolean _initialized = false; private boolean _destroyed = false; diff --git a/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java b/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java index a33591e6a5d..a2f419ebecb 100644 --- a/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java +++ b/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginInitializeFailFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginInitializeFail(); @@ -18,11 +19,13 @@ public class PluginInitializeFailFactory implements Ice.PluginFactory static class PluginInitializeFail implements Ice.Plugin { + @Override public void initialize() { throw new PluginInitializeFailException(); } + @Override public void destroy() { test(false); diff --git a/java/test/Ice/plugin/plugins/PluginOneFactory.java b/java/test/Ice/plugin/plugins/PluginOneFactory.java index c3d012f3421..b4895874772 100644 --- a/java/test/Ice/plugin/plugins/PluginOneFactory.java +++ b/java/test/Ice/plugin/plugins/PluginOneFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginOneFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginOne(communicator); @@ -23,6 +24,7 @@ public class PluginOneFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { _other = (BasePlugin)_communicator.getPluginManager().getPlugin("PluginTwo"); @@ -30,6 +32,7 @@ public class PluginOneFactory implements Ice.PluginFactory _initialized = true; } + @Override public void destroy() { _destroyed = true; diff --git a/java/test/Ice/plugin/plugins/PluginOneFailFactory.java b/java/test/Ice/plugin/plugins/PluginOneFailFactory.java index 9261b2dab41..5fd118de41e 100644 --- a/java/test/Ice/plugin/plugins/PluginOneFailFactory.java +++ b/java/test/Ice/plugin/plugins/PluginOneFailFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginOneFailFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginOneFail(communicator); @@ -23,6 +24,7 @@ public class PluginOneFailFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { _two = (BasePluginFail)_communicator.getPluginManager().getPlugin("PluginTwoFail"); @@ -32,6 +34,7 @@ public class PluginOneFailFactory implements Ice.PluginFactory _initialized = true; } + @Override public void destroy() { test(_two.isDestroyed()); @@ -42,6 +45,7 @@ public class PluginOneFailFactory implements Ice.PluginFactory _destroyed = true; } + @Override protected void finalize() throws Throwable { try diff --git a/java/test/Ice/plugin/plugins/PluginThreeFactory.java b/java/test/Ice/plugin/plugins/PluginThreeFactory.java index a8e0539e494..6fa993b414f 100644 --- a/java/test/Ice/plugin/plugins/PluginThreeFactory.java +++ b/java/test/Ice/plugin/plugins/PluginThreeFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginThreeFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginThree(communicator); @@ -23,6 +24,7 @@ public class PluginThreeFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { _other = (BasePlugin)_communicator.getPluginManager().getPlugin("PluginTwo"); @@ -30,6 +32,7 @@ public class PluginThreeFactory implements Ice.PluginFactory _initialized = true; } + @Override public void destroy() { _destroyed = true; diff --git a/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java b/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java index 438b9455e26..bc5e4cc0be1 100644 --- a/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java +++ b/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginThreeFailFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginThreeFail(communicator); @@ -23,16 +24,19 @@ public class PluginThreeFailFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { throw new PluginInitializeFailException(); } + @Override public void destroy() { test(false); } + @Override protected void finalize() throws Throwable { try diff --git a/java/test/Ice/plugin/plugins/PluginTwoFactory.java b/java/test/Ice/plugin/plugins/PluginTwoFactory.java index f6b40fbde2a..ecab2ba5222 100644 --- a/java/test/Ice/plugin/plugins/PluginTwoFactory.java +++ b/java/test/Ice/plugin/plugins/PluginTwoFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginTwoFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginTwo(communicator); @@ -23,6 +24,7 @@ public class PluginTwoFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { _other = (BasePlugin)_communicator.getPluginManager().getPlugin("PluginOne"); @@ -30,6 +32,7 @@ public class PluginTwoFactory implements Ice.PluginFactory _initialized = true; } + @Override public void destroy() { _destroyed = true; diff --git a/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java b/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java index a2c9657a511..1b5ee8fb4af 100644 --- a/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java +++ b/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginTwoFailFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginTwoFail(communicator); @@ -23,6 +24,7 @@ public class PluginTwoFailFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { _one = (BasePluginFail)_communicator.getPluginManager().getPlugin("PluginOneFail"); @@ -32,6 +34,7 @@ public class PluginTwoFailFactory implements Ice.PluginFactory _initialized = true; } + @Override public void destroy() { test(!_one.isDestroyed()); @@ -42,6 +45,7 @@ public class PluginTwoFailFactory implements Ice.PluginFactory _destroyed = true; } + @Override protected void finalize() throws Throwable { try diff --git a/java/test/Ice/properties/Client.java b/java/test/Ice/properties/Client.java index ccd10c7c32d..4b2571e185c 100644 --- a/java/test/Ice/properties/Client.java +++ b/java/test/Ice/properties/Client.java @@ -22,6 +22,7 @@ public class Client extends test.Util.Application class PropertiesClient extends Ice.Application { + @Override public int run(String[] args) { @@ -35,6 +36,7 @@ public class Client extends test.Util.Application }; }; + @Override public int run(String[] args) { { diff --git a/java/test/Ice/proxy/AMDMyDerivedClassI.java b/java/test/Ice/proxy/AMDMyDerivedClassI.java index cc8a8ef93fb..5cf41db2870 100644 --- a/java/test/Ice/proxy/AMDMyDerivedClassI.java +++ b/java/test/Ice/proxy/AMDMyDerivedClassI.java @@ -20,6 +20,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass { } + @Override public void echo_async(AMD_MyDerivedClass_echo cb, Ice.ObjectPrx obj, @@ -28,6 +29,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(obj); } + @Override public void shutdown_async(AMD_MyClass_shutdown cb, Ice.Current c) @@ -36,12 +38,14 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override public void getContext_async(AMD_MyClass_getContext cb, Ice.Current current) { cb.ice_response(_ctx); } + @Override public boolean ice_isA(String s, Ice.Current current) { diff --git a/java/test/Ice/proxy/AMDServer.java b/java/test/Ice/proxy/AMDServer.java index 5e6165a50d7..3629cf905b0 100644 --- a/java/test/Ice/proxy/AMDServer.java +++ b/java/test/Ice/proxy/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.proxy; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/proxy/AllTests.java b/java/test/Ice/proxy/AllTests.java index 4910517c0db..959caa610b0 100644 --- a/java/test/Ice/proxy/AllTests.java +++ b/java/test/Ice/proxy/AllTests.java @@ -709,7 +709,7 @@ public class AllTests try { // Invalid -x option - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 99 -v abc -x abc"); + communicator.stringToProxy("id:opaque -t 99 -v abc -x abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -719,7 +719,7 @@ public class AllTests try { // Missing -t and -v - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque"); + communicator.stringToProxy("id:opaque"); test(false); } catch(Ice.EndpointParseException ex) @@ -729,7 +729,7 @@ public class AllTests try { // Repeated -t - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 1 -t 1 -v abc"); + communicator.stringToProxy("id:opaque -t 1 -t 1 -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -739,7 +739,7 @@ public class AllTests try { // Repeated -v - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 1 -v abc -v abc"); + communicator.stringToProxy("id:opaque -t 1 -v abc -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -749,7 +749,7 @@ public class AllTests try { // Missing -t - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -v abc"); + communicator.stringToProxy("id:opaque -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -759,7 +759,7 @@ public class AllTests try { // Missing -v - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 1"); + communicator.stringToProxy("id:opaque -t 1"); test(false); } catch(Ice.EndpointParseException ex) @@ -769,7 +769,7 @@ public class AllTests try { // Missing arg for -t - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t -v abc"); + communicator.stringToProxy("id:opaque -t -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -779,7 +779,7 @@ public class AllTests try { // Missing arg for -v - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 1 -v"); + communicator.stringToProxy("id:opaque -t 1 -v"); test(false); } catch(Ice.EndpointParseException ex) @@ -789,7 +789,7 @@ public class AllTests try { // Not a number for -t - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t x -v abc"); + communicator.stringToProxy("id:opaque -t x -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -799,7 +799,7 @@ public class AllTests try { // < 0 for -t - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t -1 -v abc"); + communicator.stringToProxy("id:opaque -t -1 -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -809,7 +809,7 @@ public class AllTests try { // Invalid char for -v - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 99 -v x?c"); + communicator.stringToProxy("id:opaque -t 99 -v x?c"); test(false); } catch(Ice.EndpointParseException ex) diff --git a/java/test/Ice/proxy/Client.java b/java/test/Ice/proxy/Client.java index cee6d735ac0..1ad397216c9 100644 --- a/java/test/Ice/proxy/Client.java +++ b/java/test/Ice/proxy/Client.java @@ -13,6 +13,7 @@ import test.Ice.proxy.Test.MyClassPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/proxy/Collocated.java b/java/test/Ice/proxy/Collocated.java index 00a8ae2b356..26e71003545 100644 --- a/java/test/Ice/proxy/Collocated.java +++ b/java/test/Ice/proxy/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.proxy; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -24,6 +25,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/proxy/MyDerivedClassI.java b/java/test/Ice/proxy/MyDerivedClassI.java index 3cf8c55207b..35cc76794c0 100644 --- a/java/test/Ice/proxy/MyDerivedClassI.java +++ b/java/test/Ice/proxy/MyDerivedClassI.java @@ -17,24 +17,28 @@ public final class MyDerivedClassI extends MyDerivedClass { } + @Override public Ice.ObjectPrx echo(Ice.ObjectPrx obj, Ice.Current c) { return obj; } + @Override public void shutdown(Ice.Current c) { c.adapter.getCommunicator().shutdown(); } + @Override public java.util.Map<String, String> getContext(Ice.Current current) { return _ctx; } + @Override public boolean ice_isA(String s, Ice.Current current) { diff --git a/java/test/Ice/proxy/Server.java b/java/test/Ice/proxy/Server.java index a6efa74221c..ae09627cfe5 100644 --- a/java/test/Ice/proxy/Server.java +++ b/java/test/Ice/proxy/Server.java @@ -11,6 +11,7 @@ package test.Ice.proxy; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/retry/Client.java b/java/test/Ice/retry/Client.java index df8d88c92c9..aaec9406b13 100644 --- a/java/test/Ice/retry/Client.java +++ b/java/test/Ice/retry/Client.java @@ -13,6 +13,7 @@ import test.Ice.retry.Test.RetryPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/retry/Collocated.java b/java/test/Ice/retry/Collocated.java index 388d6888f30..63868d1d64a 100644 --- a/java/test/Ice/retry/Collocated.java +++ b/java/test/Ice/retry/Collocated.java @@ -13,6 +13,7 @@ import test.Ice.retry.Test.RetryPrx; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -25,6 +26,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/retry/Instrumentation.java b/java/test/Ice/retry/Instrumentation.java index ba8094e9db0..4c825ba7231 100644 --- a/java/test/Ice/retry/Instrumentation.java +++ b/java/test/Ice/retry/Instrumentation.java @@ -22,11 +22,13 @@ public class Instrumentation static class InvocationObserverI implements Ice.Instrumentation.InvocationObserver { + @Override public void attach() { } + @Override public void detach() { @@ -36,6 +38,7 @@ public class Instrumentation } } + @Override public void failed(String msg) { @@ -45,6 +48,7 @@ public class Instrumentation } } + @Override public void retried() { @@ -54,17 +58,20 @@ public class Instrumentation } } + @Override public void userException() { } + @Override public Ice.Instrumentation.RemoteObserver getRemoteObserver(Ice.ConnectionInfo ci, Ice.Endpoint ei, int i, int j) { return null; } + @Override public Ice.Instrumentation.CollocatedObserver getCollocatedObserver(Ice.ObjectAdapter adapter, int i , int j) { @@ -76,18 +83,21 @@ public class Instrumentation static class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver { + @Override public Ice.Instrumentation.Observer getConnectionEstablishmentObserver(Ice.Endpoint e, String s) { return null; } + @Override public Ice.Instrumentation.Observer getEndpointLookupObserver(Ice.Endpoint e) { return null; } + @Override public Ice.Instrumentation.ConnectionObserver getConnectionObserver(Ice.ConnectionInfo ci, Ice.Endpoint ei, @@ -97,6 +107,7 @@ public class Instrumentation return null; } + @Override public Ice.Instrumentation.ThreadObserver getThreadObserver(String p, String n, @@ -106,18 +117,21 @@ public class Instrumentation return null; } + @Override public Ice.Instrumentation.InvocationObserver getInvocationObserver(Ice.ObjectPrx p, String o, java.util.Map<String, String> c) { return invocationObserver; } + @Override public Ice.Instrumentation.DispatchObserver getDispatchObserver(Ice.Current c, int i) { return null; } + @Override public void setObserverUpdater(Ice.Instrumentation.ObserverUpdater u) { diff --git a/java/test/Ice/retry/RetryI.java b/java/test/Ice/retry/RetryI.java index ae336cac007..31a0b104f55 100644 --- a/java/test/Ice/retry/RetryI.java +++ b/java/test/Ice/retry/RetryI.java @@ -17,6 +17,7 @@ public final class RetryI extends _RetryDisp { } + @Override public void op(boolean kill, Ice.Current current) { @@ -33,6 +34,7 @@ public final class RetryI extends _RetryDisp } } + @Override public int opIdempotent(int counter, Ice.Current current) { @@ -51,6 +53,7 @@ public final class RetryI extends _RetryDisp return _counter; } + @Override public void opNotIdempotent(int counter, Ice.Current current) { @@ -70,12 +73,14 @@ public final class RetryI extends _RetryDisp } } + @Override public void opSystemException(Ice.Current c) { throw new SystemFailure(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/retry/Server.java b/java/test/Ice/retry/Server.java index 16d21566553..678839b36a5 100644 --- a/java/test/Ice/retry/Server.java +++ b/java/test/Ice/retry/Server.java @@ -11,6 +11,7 @@ package test.Ice.retry; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/retry/SystemFailure.java b/java/test/Ice/retry/SystemFailure.java index f6c81c39694..fc03b8e6f82 100644 --- a/java/test/Ice/retry/SystemFailure.java +++ b/java/test/Ice/retry/SystemFailure.java @@ -11,6 +11,7 @@ package test.Ice.retry; class SystemFailure extends Ice.SystemException { + @Override public String ice_name() { diff --git a/java/test/Ice/seqMapping/AMDMyClassI.java b/java/test/Ice/seqMapping/AMDMyClassI.java index c483653323c..49ee338fc1d 100644 --- a/java/test/Ice/seqMapping/AMDMyClassI.java +++ b/java/test/Ice/seqMapping/AMDMyClassI.java @@ -14,6 +14,7 @@ import test.Ice.seqMapping.Serialize.*; public final class AMDMyClassI extends MyClass { + @Override public void shutdown_async(AMD_MyClass_shutdown cb, Ice.Current current) { @@ -21,18 +22,21 @@ public final class AMDMyClassI extends MyClass cb.ice_response(); } + @Override public void opSerialSmallJava_async(AMD_MyClass_opSerialSmallJava cb, Small i, Ice.Current current) { cb.ice_response(i, i); } + @Override public void opSerialLargeJava_async(AMD_MyClass_opSerialLargeJava cb, Large i, Ice.Current current) { cb.ice_response(i, i); } + @Override public void opSerialStructJava_async(AMD_MyClass_opSerialStructJava cb, Struct i, Ice.Current current) { cb.ice_response(i, i); diff --git a/java/test/Ice/seqMapping/AMDServer.java b/java/test/Ice/seqMapping/AMDServer.java index 0578dbc3c4b..5c3e9bc5fc0 100644 --- a/java/test/Ice/seqMapping/AMDServer.java +++ b/java/test/Ice/seqMapping/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.seqMapping; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { @@ -21,6 +22,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/seqMapping/Client.java b/java/test/Ice/seqMapping/Client.java index 1d7fd68301d..2124aefda4d 100644 --- a/java/test/Ice/seqMapping/Client.java +++ b/java/test/Ice/seqMapping/Client.java @@ -13,6 +13,7 @@ import test.Ice.seqMapping.Test.*; public class Client extends test.Util.Application { + @Override public int run(String[] args) { @@ -28,6 +29,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/seqMapping/Collocated.java b/java/test/Ice/seqMapping/Collocated.java index fc365c51137..bafcdce6b20 100644 --- a/java/test/Ice/seqMapping/Collocated.java +++ b/java/test/Ice/seqMapping/Collocated.java @@ -9,10 +9,9 @@ package test.Ice.seqMapping; -import test.Ice.seqMapping.Test.*; - public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { @@ -26,6 +25,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/seqMapping/MyClassI.java b/java/test/Ice/seqMapping/MyClassI.java index f354de6e369..f0a2505be21 100644 --- a/java/test/Ice/seqMapping/MyClassI.java +++ b/java/test/Ice/seqMapping/MyClassI.java @@ -14,33 +14,28 @@ import test.Ice.seqMapping.Serialize.*; public final class MyClassI extends MyClass { - private static void - test(boolean b) - { - if(!b) - { - throw new RuntimeException(); - } - } - + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public Small opSerialSmallJava(Small i, Ice.Holder<Small> o, Ice.Current current) { o.value = i; return i; } + @Override public Large opSerialLargeJava(Large i, Ice.Holder<Large> o, Ice.Current current) { o.value = i; return i; } + @Override public Struct opSerialStructJava(Struct i, Ice.Holder<Struct> o, Ice.Current current) { o.value = i; diff --git a/java/test/Ice/seqMapping/Server.java b/java/test/Ice/seqMapping/Server.java index 575e3fd0b98..eea5e6536dd 100644 --- a/java/test/Ice/seqMapping/Server.java +++ b/java/test/Ice/seqMapping/Server.java @@ -9,10 +9,9 @@ package test.Ice.seqMapping; -import test.Ice.seqMapping.Test.*; - public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -23,6 +22,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/seqMapping/TwowaysAMI.java b/java/test/Ice/seqMapping/TwowaysAMI.java index 7bf768ac402..77e75aacc7d 100644 --- a/java/test/Ice/seqMapping/TwowaysAMI.java +++ b/java/test/Ice/seqMapping/TwowaysAMI.java @@ -61,6 +61,7 @@ class TwowaysAMI private static class AMI_MyClass_opSerialSmallJavaNull extends AMI_MyClass_opSerialSmallJava { + @Override public void ice_response(Small r, Small o) { @@ -69,6 +70,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -86,6 +88,7 @@ class TwowaysAMI private static class AMI_MyClass_opSerialSmallJavaI extends AMI_MyClass_opSerialSmallJava { + @Override public void ice_response(Small r, Small o) { @@ -94,6 +97,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -111,6 +115,7 @@ class TwowaysAMI private static class AMI_MyClass_opSerialLargeJavaI extends AMI_MyClass_opSerialLargeJava { + @Override public void ice_response(Large r, Large o) { @@ -137,6 +142,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -154,6 +160,7 @@ class TwowaysAMI private static class AMI_MyClass_opSerialStructJavaI extends AMI_MyClass_opSerialStructJava { + @Override public void ice_response(Struct r, Struct o) { @@ -172,6 +179,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { diff --git a/java/test/Ice/serialize/AllTests.java b/java/test/Ice/serialize/AllTests.java index 61940783a66..212acc0893c 100644 --- a/java/test/Ice/serialize/AllTests.java +++ b/java/test/Ice/serialize/AllTests.java @@ -65,8 +65,15 @@ public class AllTests byte[] bytes = initial.getStruct1(); ByteArrayInputStream bais = new ByteArrayInputStream(bytes); Ice.ObjectInputStream ois = new Ice.ObjectInputStream(communicator, bais); - Struct1 s = (Struct1)ois.readObject(); - checkStruct1(s); + try + { + Struct1 s = (Struct1)ois.readObject(); + checkStruct1(s); + } + finally + { + ois.close(); + } } catch(Throwable ex) { @@ -81,8 +88,15 @@ public class AllTests byte[] bytes = initial.getBase(); ByteArrayInputStream bais = new ByteArrayInputStream(bytes); Ice.ObjectInputStream ois = new Ice.ObjectInputStream(communicator, bais); - Base b = (Base)ois.readObject(); - checkBase(b); + try + { + Base b = (Base) ois.readObject(); + checkBase(b); + } + finally + { + ois.close(); + } } catch(Throwable ex) { @@ -97,9 +111,16 @@ public class AllTests byte[] bytes = initial.getEx(); ByteArrayInputStream bais = new ByteArrayInputStream(bytes); Ice.ObjectInputStream ois = new Ice.ObjectInputStream(communicator, bais); - Ex ex = (Ex)ois.readObject(); - checkStruct1(ex.s); - checkBase(ex.b); + try + { + Ex ex = (Ex)ois.readObject(); + checkStruct1(ex.s); + checkBase(ex.b); + } + finally + { + ois.close(); + } } catch(Throwable ex) { diff --git a/java/test/Ice/serialize/Client.java b/java/test/Ice/serialize/Client.java index 239fb0449d0..ffa339ba2ca 100644 --- a/java/test/Ice/serialize/Client.java +++ b/java/test/Ice/serialize/Client.java @@ -12,6 +12,7 @@ import test.Ice.serialize.Test.*; public class Client extends test.Util.Application { + @Override public int run(String[] args) { @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/serialize/InitialI.java b/java/test/Ice/serialize/InitialI.java index 4eca8a4d431..9fdd4e03c4c 100644 --- a/java/test/Ice/serialize/InitialI.java +++ b/java/test/Ice/serialize/InitialI.java @@ -46,6 +46,7 @@ public final class InitialI extends _InitialDisp _d.p = _s.p; } + @Override public byte[] getStruct1(Ice.Current current) { @@ -64,6 +65,7 @@ public final class InitialI extends _InitialDisp } } + @Override public byte[] getBase(Ice.Current current) { @@ -82,6 +84,7 @@ public final class InitialI extends _InitialDisp } } + @Override public byte[] getEx(Ice.Current current) { @@ -104,6 +107,7 @@ public final class InitialI extends _InitialDisp } } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/serialize/Server.java b/java/test/Ice/serialize/Server.java index 41d8dca2c97..19346017593 100644 --- a/java/test/Ice/serialize/Server.java +++ b/java/test/Ice/serialize/Server.java @@ -8,10 +8,10 @@ // ********************************************************************** package test.Ice.serialize; -import test.Ice.serialize.Test.*; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -24,6 +24,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/servantLocator/AMDCookieI.java b/java/test/Ice/servantLocator/AMDCookieI.java index 66385ac2829..5f0d227ed38 100644 --- a/java/test/Ice/servantLocator/AMDCookieI.java +++ b/java/test/Ice/servantLocator/AMDCookieI.java @@ -13,6 +13,7 @@ import test.Ice.servantLocator.AMD.Test.Cookie; public final class AMDCookieI extends Cookie { + @Override public String message() { diff --git a/java/test/Ice/servantLocator/AMDServantLocatorI.java b/java/test/Ice/servantLocator/AMDServantLocatorI.java index c189767e25b..24b14d3ef39 100644 --- a/java/test/Ice/servantLocator/AMDServantLocatorI.java +++ b/java/test/Ice/servantLocator/AMDServantLocatorI.java @@ -28,6 +28,7 @@ public final class AMDServantLocatorI implements Ice.ServantLocator _requestId = -1; } + @Override protected synchronized void finalize() throws Throwable @@ -44,6 +45,7 @@ public final class AMDServantLocatorI implements Ice.ServantLocator } } + @Override public Ice.Object locate(Ice.Current current, Ice.LocalObjectHolder cookie) throws Ice.UserException { @@ -76,6 +78,7 @@ public final class AMDServantLocatorI implements Ice.ServantLocator return new AMDTestI(); } + @Override public void finished(Ice.Current current, Ice.Object servant, java.lang.Object cookie) throws Ice.UserException { @@ -102,6 +105,7 @@ public final class AMDServantLocatorI implements Ice.ServantLocator test(co.message().equals("blahblah")); } + @Override public synchronized void deactivate(String category) { diff --git a/java/test/Ice/servantLocator/AMDServer.java b/java/test/Ice/servantLocator/AMDServer.java index e7698c50fe7..29f8754170a 100644 --- a/java/test/Ice/servantLocator/AMDServer.java +++ b/java/test/Ice/servantLocator/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.servantLocator; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { @@ -23,6 +24,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/servantLocator/AMDTestActivationI.java b/java/test/Ice/servantLocator/AMDTestActivationI.java index d4d3f651657..31ecfeab516 100644 --- a/java/test/Ice/servantLocator/AMDTestActivationI.java +++ b/java/test/Ice/servantLocator/AMDTestActivationI.java @@ -13,6 +13,7 @@ import test.Ice.servantLocator.Test._TestActivationDisp; public final class AMDTestActivationI extends _TestActivationDisp { + @Override public void activateServantLocator(boolean activate, Ice.Current current) { if(activate) diff --git a/java/test/Ice/servantLocator/AMDTestI.java b/java/test/Ice/servantLocator/AMDTestI.java index 6879c15fd17..999b2871a89 100644 --- a/java/test/Ice/servantLocator/AMDTestI.java +++ b/java/test/Ice/servantLocator/AMDTestI.java @@ -27,30 +27,35 @@ import test.Ice.servantLocator.AMD.Test._TestIntfDisp; public final class AMDTestI extends _TestIntfDisp { + @Override public void requestFailedException_async(AMD_TestIntf_requestFailedException cb, Ice.Current current) { cb.ice_response(); } + @Override public void unknownUserException_async(AMD_TestIntf_unknownUserException cb, Ice.Current current) { cb.ice_response(); } + @Override public void unknownLocalException_async(AMD_TestIntf_unknownLocalException cb, Ice.Current current) { cb.ice_response(); } + @Override public void unknownException_async(AMD_TestIntf_unknownException cb, Ice.Current current) { cb.ice_response(); } + @Override public void localException_async(AMD_TestIntf_localException cb, Ice.Current current) { @@ -63,12 +68,14 @@ public final class AMDTestI extends _TestIntfDisp // cb.ice_response(); // } + @Override public void javaException_async(AMD_TestIntf_javaException cb, Ice.Current current) { cb.ice_response(); } + @Override public void unknownExceptionWithServantException_async(AMD_TestIntf_unknownExceptionWithServantException cb, Ice.Current current) @@ -76,6 +83,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(new Ice.ObjectNotExistException()); } + @Override public void impossibleException_async(AMD_TestIntf_impossibleException cb, boolean _throw, Ice.Current current) { @@ -93,6 +101,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void intfUserException_async(AMD_TestIntf_intfUserException cb, boolean _throw, Ice.Current current) { @@ -110,6 +119,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void asyncResponse_async(AMD_TestIntf_asyncResponse cb, Ice.Current current) { @@ -117,6 +127,7 @@ public final class AMDTestI extends _TestIntfDisp throw new Ice.ObjectNotExistException(); } + @Override public void asyncException_async(AMD_TestIntf_asyncException cb, Ice.Current current) { @@ -124,6 +135,7 @@ public final class AMDTestI extends _TestIntfDisp throw new Ice.ObjectNotExistException(); } + @Override public void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) { diff --git a/java/test/Ice/servantLocator/Client.java b/java/test/Ice/servantLocator/Client.java index 6b173584769..c781cb5ac50 100644 --- a/java/test/Ice/servantLocator/Client.java +++ b/java/test/Ice/servantLocator/Client.java @@ -13,6 +13,7 @@ import test.Ice.servantLocator.Test.TestIntfPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { TestIntfPrx obj = AllTests.allTests(communicator(), getWriter()); @@ -20,6 +21,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/servantLocator/Collocated.java b/java/test/Ice/servantLocator/Collocated.java index 0c0d2d9e35d..612602d933d 100644 --- a/java/test/Ice/servantLocator/Collocated.java +++ b/java/test/Ice/servantLocator/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.servantLocator; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); @@ -23,6 +24,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/servantLocator/CookieI.java b/java/test/Ice/servantLocator/CookieI.java index eb06db5de29..52bab91e922 100644 --- a/java/test/Ice/servantLocator/CookieI.java +++ b/java/test/Ice/servantLocator/CookieI.java @@ -13,6 +13,7 @@ import test.Ice.servantLocator.Test.Cookie; public final class CookieI extends Cookie { + @Override public String message() { diff --git a/java/test/Ice/servantLocator/ServantLocatorI.java b/java/test/Ice/servantLocator/ServantLocatorI.java index 1b6d6cefee3..f3fa5388634 100644 --- a/java/test/Ice/servantLocator/ServantLocatorI.java +++ b/java/test/Ice/servantLocator/ServantLocatorI.java @@ -28,6 +28,7 @@ public final class ServantLocatorI implements Ice.ServantLocator _requestId = -1; } + @Override protected synchronized void finalize() throws Throwable @@ -44,6 +45,7 @@ public final class ServantLocatorI implements Ice.ServantLocator } } + @Override public Ice.Object locate(Ice.Current current, Ice.LocalObjectHolder cookie) throws Ice.UserException { @@ -76,6 +78,7 @@ public final class ServantLocatorI implements Ice.ServantLocator return new TestI(); } + @Override public void finished(Ice.Current current, Ice.Object servant, java.lang.Object cookie) throws Ice.UserException { @@ -102,6 +105,7 @@ public final class ServantLocatorI implements Ice.ServantLocator test(co.message().equals("blahblah")); } + @Override public synchronized void deactivate(String category) { diff --git a/java/test/Ice/servantLocator/Server.java b/java/test/Ice/servantLocator/Server.java index 06bb4fec80b..bd3dfdc7288 100644 --- a/java/test/Ice/servantLocator/Server.java +++ b/java/test/Ice/servantLocator/Server.java @@ -11,6 +11,7 @@ package test.Ice.servantLocator; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); @@ -22,6 +23,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/servantLocator/TestActivationI.java b/java/test/Ice/servantLocator/TestActivationI.java index 19d21fa497a..3c1c6f209ad 100644 --- a/java/test/Ice/servantLocator/TestActivationI.java +++ b/java/test/Ice/servantLocator/TestActivationI.java @@ -13,6 +13,7 @@ import test.Ice.servantLocator.Test._TestActivationDisp; public final class TestActivationI extends _TestActivationDisp { + @Override public void activateServantLocator(boolean activate, Ice.Current current) { if(activate) diff --git a/java/test/Ice/servantLocator/TestI.java b/java/test/Ice/servantLocator/TestI.java index fa44375cc54..b0704d4f6a6 100644 --- a/java/test/Ice/servantLocator/TestI.java +++ b/java/test/Ice/servantLocator/TestI.java @@ -15,26 +15,31 @@ import test.Ice.servantLocator.Test._TestIntfDisp; public final class TestI extends _TestIntfDisp { + @Override public void requestFailedException(Ice.Current current) { } + @Override public void unknownUserException(Ice.Current current) { } + @Override public void unknownLocalException(Ice.Current current) { } + @Override public void unknownException(Ice.Current current) { } + @Override public void localException(Ice.Current current) { @@ -45,17 +50,20 @@ public final class TestI extends _TestIntfDisp // { // } + @Override public void javaException(Ice.Current current) { } + @Override public void unknownExceptionWithServantException(Ice.Current current) { throw new Ice.ObjectNotExistException(); } + @Override public String impossibleException(boolean _throw, Ice.Current current) throws TestImpossibleException { @@ -71,6 +79,7 @@ public final class TestI extends _TestIntfDisp return "Hello"; } + @Override public String intfUserException(boolean _throw, Ice.Current current) throws TestIntfUserException, TestImpossibleException { @@ -86,6 +95,7 @@ public final class TestI extends _TestIntfDisp return "Hello"; } + @Override public void asyncResponse(Ice.Current current) throws TestIntfUserException, TestImpossibleException { @@ -94,6 +104,7 @@ public final class TestI extends _TestIntfDisp // } + @Override public void asyncException(Ice.Current current) throws TestIntfUserException, TestImpossibleException { @@ -102,6 +113,7 @@ public final class TestI extends _TestIntfDisp // } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/slicing/exceptions/AMDServer.java b/java/test/Ice/slicing/exceptions/AMDServer.java index d17e136543c..acca7cf53e8 100644 --- a/java/test/Ice/slicing/exceptions/AMDServer.java +++ b/java/test/Ice/slicing/exceptions/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.slicing.exceptions; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); @@ -20,6 +21,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/exceptions/AMDTestI.java b/java/test/Ice/slicing/exceptions/AMDTestI.java index c1b7a812abc..07ca77f5dad 100644 --- a/java/test/Ice/slicing/exceptions/AMDTestI.java +++ b/java/test/Ice/slicing/exceptions/AMDTestI.java @@ -22,6 +22,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) { @@ -29,6 +30,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void baseAsBase_async(AMD_TestIntf_baseAsBase cb, Ice.Current current) throws Base @@ -38,6 +40,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(b); } + @Override public void unknownDerivedAsBase_async(AMD_TestIntf_unknownDerivedAsBase cb, Ice.Current current) throws Base @@ -48,6 +51,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(d); } + @Override public void knownDerivedAsBase_async(AMD_TestIntf_knownDerivedAsBase cb, Ice.Current current) throws Base @@ -58,6 +62,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(d); } + @Override public void knownDerivedAsKnownDerived_async(AMD_TestIntf_knownDerivedAsKnownDerived cb, Ice.Current current) throws KnownDerived @@ -68,6 +73,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(d); } + @Override public void unknownIntermediateAsBase_async(AMD_TestIntf_unknownIntermediateAsBase cb, Ice.Current current) throws Base @@ -78,6 +84,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ui); } + @Override public void knownIntermediateAsBase_async(AMD_TestIntf_knownIntermediateAsBase cb, Ice.Current current) throws Base @@ -88,6 +95,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ki); } + @Override public void knownMostDerivedAsBase_async(AMD_TestIntf_knownMostDerivedAsBase cb, Ice.Current current) throws Base @@ -99,6 +107,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(kmd); } + @Override public void knownIntermediateAsKnownIntermediate_async(AMD_TestIntf_knownIntermediateAsKnownIntermediate cb, Ice.Current current) @@ -110,6 +119,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ki); } + @Override public void knownMostDerivedAsKnownIntermediate_async(AMD_TestIntf_knownMostDerivedAsKnownIntermediate cb, Ice.Current current) @@ -122,6 +132,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(kmd); } + @Override public void knownMostDerivedAsKnownMostDerived_async(AMD_TestIntf_knownMostDerivedAsKnownMostDerived cb, Ice.Current current) @@ -134,6 +145,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(kmd); } + @Override public void unknownMostDerived1AsBase_async(AMD_TestIntf_unknownMostDerived1AsBase cb, Ice.Current current) throws Base @@ -145,6 +157,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(umd1); } + @Override public void unknownMostDerived1AsKnownIntermediate_async(AMD_TestIntf_unknownMostDerived1AsKnownIntermediate cb, Ice.Current current) @@ -157,6 +170,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(umd1); } + @Override public void unknownMostDerived2AsBase_async(AMD_TestIntf_unknownMostDerived2AsBase cb, Ice.Current current) throws Base @@ -168,6 +182,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(umd2); } + @Override public void unknownMostDerived2AsBaseCompact_async(AMD_TestIntf_unknownMostDerived2AsBaseCompact cb, Ice.Current current) { @@ -178,6 +193,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(umd2); } + @Override public void knownPreservedAsBase_async(AMD_TestIntf_knownPreservedAsBase cb, Ice.Current current) { @@ -188,6 +204,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ex); } + @Override public void knownPreservedAsKnownPreserved_async(AMD_TestIntf_knownPreservedAsKnownPreserved cb, Ice.Current current) { @@ -198,6 +215,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ex); } + @Override public void relayKnownPreservedAsBase_async(AMD_TestIntf_relayKnownPreservedAsBase cb, RelayPrx r, Ice.Current current) { @@ -216,6 +234,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void relayKnownPreservedAsKnownPreserved_async(AMD_TestIntf_relayKnownPreservedAsKnownPreserved cb, RelayPrx r, Ice.Current current) @@ -235,6 +254,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void unknownPreservedAsBase_async(AMD_TestIntf_unknownPreservedAsBase cb, Ice.Current current) { @@ -247,6 +267,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ex); } + @Override public void unknownPreservedAsKnownPreserved_async(AMD_TestIntf_unknownPreservedAsKnownPreserved cb, Ice.Current current) { @@ -259,6 +280,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ex); } + @Override public void relayUnknownPreservedAsBase_async(AMD_TestIntf_relayUnknownPreservedAsBase cb, RelayPrx r, Ice.Current current) { @@ -277,6 +299,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void relayUnknownPreservedAsKnownPreserved_async(AMD_TestIntf_relayUnknownPreservedAsKnownPreserved cb, RelayPrx r, Ice.Current current) diff --git a/java/test/Ice/slicing/exceptions/AllTests.java b/java/test/Ice/slicing/exceptions/AllTests.java index 9fa8b506246..cd159a9006b 100644 --- a/java/test/Ice/slicing/exceptions/AllTests.java +++ b/java/test/Ice/slicing/exceptions/AllTests.java @@ -59,18 +59,21 @@ public class AllTests private static class Callback_TestIntf_baseAsBaseI extends Callback_TestIntf_baseAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -101,18 +104,21 @@ public class AllTests private static class Callback_TestIntf_unknownDerivedAsBaseI extends Callback_TestIntf_unknownDerivedAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -143,18 +149,21 @@ public class AllTests private static class Callback_TestIntf_knownDerivedAsBaseI extends Callback_TestIntf_knownDerivedAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -187,18 +196,21 @@ public class AllTests private static class Callback_TestIntf_knownDerivedAsKnownDerivedI extends Callback_TestIntf_knownDerivedAsKnownDerived { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -231,18 +243,21 @@ public class AllTests private static class Callback_TestIntf_unknownIntermediateAsBaseI extends Callback_TestIntf_unknownIntermediateAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -273,18 +288,21 @@ public class AllTests private static class Callback_TestIntf_knownIntermediateAsBaseI extends Callback_TestIntf_knownIntermediateAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -316,18 +334,21 @@ public class AllTests private static class Callback_TestIntf_knownMostDerivedAsBaseI extends Callback_TestIntf_knownMostDerivedAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -361,18 +382,21 @@ public class AllTests private static class Callback_TestIntf_knownIntermediateAsKnownIntermediateI extends Callback_TestIntf_knownIntermediateAsKnownIntermediate { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -405,18 +429,21 @@ public class AllTests private static class Callback_TestIntf_knownMostDerivedAsKnownIntermediateI extends Callback_TestIntf_knownMostDerivedAsKnownIntermediate { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -450,18 +477,21 @@ public class AllTests private static class Callback_TestIntf_knownMostDerivedAsKnownMostDerivedI extends Callback_TestIntf_knownMostDerivedAsKnownMostDerived { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -495,18 +525,21 @@ public class AllTests private static class Callback_TestIntf_unknownMostDerived1AsBaseI extends Callback_TestIntf_unknownMostDerived1AsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -539,18 +572,21 @@ public class AllTests private static class Callback_TestIntf_unknownMostDerived1AsKnownIntermediateI extends Callback_TestIntf_unknownMostDerived1AsKnownIntermediate { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -583,18 +619,21 @@ public class AllTests private static class Callback_TestIntf_unknownMostDerived2AsBaseI extends Callback_TestIntf_unknownMostDerived2AsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -625,6 +664,7 @@ public class AllTests private static class RelayI extends _RelayDisp { + @Override public void knownPreservedAsBase(Ice.Current current) throws Base { @@ -635,6 +675,7 @@ public class AllTests throw ex; } + @Override public void knownPreservedAsKnownPreserved(Ice.Current current) throws KnownPreserved { @@ -645,6 +686,7 @@ public class AllTests throw ex; } + @Override public void unknownPreservedAsBase(Ice.Current current) throws Base { @@ -657,6 +699,7 @@ public class AllTests throw ex; } + @Override public void unknownPreservedAsKnownPreserved(Ice.Current current) throws KnownPreserved { diff --git a/java/test/Ice/slicing/exceptions/Client.java b/java/test/Ice/slicing/exceptions/Client.java index e0a8601ccbd..bee392fe3b3 100644 --- a/java/test/Ice/slicing/exceptions/Client.java +++ b/java/test/Ice/slicing/exceptions/Client.java @@ -13,6 +13,7 @@ import test.Ice.slicing.exceptions.client.Test.TestIntfPrx; public class Client extends test.Util.Application { + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/exceptions/Server.java b/java/test/Ice/slicing/exceptions/Server.java index ab6bb8adcba..0844dd92275 100644 --- a/java/test/Ice/slicing/exceptions/Server.java +++ b/java/test/Ice/slicing/exceptions/Server.java @@ -21,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/exceptions/TestI.java b/java/test/Ice/slicing/exceptions/TestI.java index 9676c1b2589..9cedab3b4af 100644 --- a/java/test/Ice/slicing/exceptions/TestI.java +++ b/java/test/Ice/slicing/exceptions/TestI.java @@ -22,12 +22,14 @@ public final class TestI extends _TestIntfDisp } } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public void baseAsBase(Ice.Current current) throws Base @@ -37,6 +39,7 @@ public final class TestI extends _TestIntfDisp throw b; } + @Override public void unknownDerivedAsBase(Ice.Current current) throws Base @@ -47,6 +50,7 @@ public final class TestI extends _TestIntfDisp throw d; } + @Override public void knownDerivedAsBase(Ice.Current current) throws Base @@ -57,6 +61,7 @@ public final class TestI extends _TestIntfDisp throw d; } + @Override public void knownDerivedAsKnownDerived(Ice.Current current) throws KnownDerived @@ -67,6 +72,7 @@ public final class TestI extends _TestIntfDisp throw d; } + @Override public void unknownIntermediateAsBase(Ice.Current current) throws Base @@ -77,6 +83,7 @@ public final class TestI extends _TestIntfDisp throw ui; } + @Override public void knownIntermediateAsBase(Ice.Current current) throws Base @@ -87,6 +94,7 @@ public final class TestI extends _TestIntfDisp throw ki; } + @Override public void knownMostDerivedAsBase(Ice.Current current) throws Base @@ -98,6 +106,7 @@ public final class TestI extends _TestIntfDisp throw kmd; } + @Override public void knownIntermediateAsKnownIntermediate(Ice.Current current) throws KnownIntermediate @@ -108,6 +117,7 @@ public final class TestI extends _TestIntfDisp throw ki; } + @Override public void knownMostDerivedAsKnownIntermediate(Ice.Current current) throws KnownIntermediate @@ -119,6 +129,7 @@ public final class TestI extends _TestIntfDisp throw kmd; } + @Override public void knownMostDerivedAsKnownMostDerived(Ice.Current current) throws KnownMostDerived @@ -130,6 +141,7 @@ public final class TestI extends _TestIntfDisp throw kmd; } + @Override public void unknownMostDerived1AsBase(Ice.Current current) throws Base @@ -141,6 +153,7 @@ public final class TestI extends _TestIntfDisp throw umd1; } + @Override public void unknownMostDerived1AsKnownIntermediate(Ice.Current current) throws KnownIntermediate @@ -152,6 +165,7 @@ public final class TestI extends _TestIntfDisp throw umd1; } + @Override public void unknownMostDerived2AsBase(Ice.Current current) throws Base @@ -163,6 +177,7 @@ public final class TestI extends _TestIntfDisp throw umd2; } + @Override public void unknownMostDerived2AsBaseCompact(Ice.Current current) throws Base @@ -174,6 +189,7 @@ public final class TestI extends _TestIntfDisp throw umd2; } + @Override public void knownPreservedAsBase(Ice.Current current) throws Base @@ -185,6 +201,7 @@ public final class TestI extends _TestIntfDisp throw ex; } + @Override public void knownPreservedAsKnownPreserved(Ice.Current current) throws KnownPreserved @@ -196,6 +213,7 @@ public final class TestI extends _TestIntfDisp throw ex; } + @Override public void relayKnownPreservedAsBase(RelayPrx r, Ice.Current current) throws Base @@ -204,6 +222,7 @@ public final class TestI extends _TestIntfDisp test(false); } + @Override public void relayKnownPreservedAsKnownPreserved(RelayPrx r, Ice.Current current) throws KnownPreserved @@ -212,6 +231,7 @@ public final class TestI extends _TestIntfDisp test(false); } + @Override public void unknownPreservedAsBase(Ice.Current current) throws Base @@ -225,6 +245,7 @@ public final class TestI extends _TestIntfDisp throw ex; } + @Override public void unknownPreservedAsKnownPreserved(Ice.Current current) throws KnownPreserved @@ -238,6 +259,7 @@ public final class TestI extends _TestIntfDisp throw ex; } + @Override public void relayUnknownPreservedAsBase(RelayPrx r, Ice.Current current) throws Base @@ -246,6 +268,7 @@ public final class TestI extends _TestIntfDisp test(false); } + @Override public void relayUnknownPreservedAsKnownPreserved(RelayPrx r, Ice.Current current) throws KnownPreserved diff --git a/java/test/Ice/slicing/objects/AMDServer.java b/java/test/Ice/slicing/objects/AMDServer.java index c3a3c282e4c..c905976b193 100644 --- a/java/test/Ice/slicing/objects/AMDServer.java +++ b/java/test/Ice/slicing/objects/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.slicing.objects; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/objects/AMDTestI.java b/java/test/Ice/slicing/objects/AMDTestI.java index 877a3181bb5..f1c9e814a9b 100644 --- a/java/test/Ice/slicing/objects/AMDTestI.java +++ b/java/test/Ice/slicing/objects/AMDTestI.java @@ -22,6 +22,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) { @@ -29,6 +30,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void SBaseAsObject_async(AMD_TestIntf_SBaseAsObject cb, Ice.Current current) { @@ -37,6 +39,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sb); } + @Override public void SBaseAsSBase_async(AMD_TestIntf_SBaseAsSBase cb, Ice.Current current) { @@ -45,6 +48,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sb); } + @Override public void SBSKnownDerivedAsSBase_async(AMD_TestIntf_SBSKnownDerivedAsSBase cb, Ice.Current current) { @@ -54,6 +58,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sbskd); } + @Override public void SBSKnownDerivedAsSBSKnownDerived_async(AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerived cb, Ice.Current current) { @@ -63,6 +68,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sbskd); } + @Override public void SBSUnknownDerivedAsSBase_async(AMD_TestIntf_SBSUnknownDerivedAsSBase cb, Ice.Current current) { @@ -72,6 +78,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sbsud); } + @Override public void SBSUnknownDerivedAsSBaseCompact_async(AMD_TestIntf_SBSUnknownDerivedAsSBaseCompact cb, Ice.Current current) { @@ -81,6 +88,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sbsud); } + @Override public void SUnknownAsObject_async(AMD_TestIntf_SUnknownAsObject cb, Ice.Current current) { @@ -89,6 +97,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(su); } + @Override public void checkSUnknown_async(AMD_TestIntf_checkSUnknown cb, Ice.Object obj, Ice.Current current) { @@ -104,6 +113,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void oneElementCycle_async(AMD_TestIntf_oneElementCycle cb, Ice.Current current) { @@ -113,6 +123,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(b); } + @Override public void twoElementCycle_async(AMD_TestIntf_twoElementCycle cb, Ice.Current current) { @@ -125,6 +136,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(b1); } + @Override public void D1AsB_async(AMD_TestIntf_D1AsB cb, Ice.Current current) { @@ -141,6 +153,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d1); } + @Override public void D1AsD1_async(AMD_TestIntf_D1AsD1 cb, Ice.Current current) { @@ -157,6 +170,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d1); } + @Override public void D2AsB_async(AMD_TestIntf_D2AsB cb, Ice.Current current) { @@ -173,6 +187,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d2); } + @Override public void paramTest1_async(AMD_TestIntf_paramTest1 cb, Ice.Current current) { @@ -189,6 +204,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d1, d2); } + @Override public void paramTest2_async(AMD_TestIntf_paramTest2 cb, Ice.Current current) { @@ -205,6 +221,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d2, d1); } + @Override public void paramTest3_async(AMD_TestIntf_paramTest3 cb, Ice.Current current) { @@ -234,6 +251,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d3, d2, d4); } + @Override public void paramTest4_async(AMD_TestIntf_paramTest4 cb, Ice.Current current) { @@ -247,6 +265,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d4.p2, d4); } + @Override public void returnTest1_async(AMD_TestIntf_returnTest1 cb, Ice.Current current) { @@ -263,6 +282,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d2, d2, d1); } + @Override public void returnTest2_async(AMD_TestIntf_returnTest2 cb, Ice.Current current) { @@ -279,12 +299,14 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d1, d1, d2); } + @Override public void returnTest3_async(AMD_TestIntf_returnTest3 cb, B p1, B p2, Ice.Current current) { cb.ice_response(p1); } + @Override public void sequenceTest_async(AMD_TestIntf_sequenceTest cb, SS1 p1, SS2 p2, Ice.Current current) { @@ -294,6 +316,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(ss); } + @Override public void dictionaryTest_async(AMD_TestIntf_dictionaryTest cb, java.util.Map<Integer, B> bin, Ice.Current current) { @@ -323,12 +346,14 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(r, bout); } + @Override public void exchangePBase_async(AMD_TestIntf_exchangePBase cb, PBase pb, Ice.Current current) { cb.ice_response(pb); } + @Override public void PBSUnknownAsPreserved_async(AMD_TestIntf_PBSUnknownAsPreserved cb, Ice.Current current) { @@ -348,6 +373,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(r); } + @Override public void checkPBSUnknown_async(AMD_TestIntf_checkPBSUnknown cb, Preserved p, Ice.Current current) { @@ -369,6 +395,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void PBSUnknownAsPreservedWithGraph_async(AMD_TestIntf_PBSUnknownAsPreservedWithGraph cb, Ice.Current current) { @@ -384,6 +411,7 @@ public final class AMDTestI extends _TestIntfDisp r.graph.next.next.next = null; // Break the cycle. } + @Override public void checkPBSUnknownWithGraph_async(AMD_TestIntf_checkPBSUnknownWithGraph cb, Preserved p, Ice.Current current) { @@ -407,6 +435,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void PBSUnknown2AsPreservedWithGraph_async(AMD_TestIntf_PBSUnknown2AsPreservedWithGraph cb, Ice.Current current) { @@ -418,6 +447,7 @@ public final class AMDTestI extends _TestIntfDisp r.pb = null; // Break the cycle. } + @Override public void checkPBSUnknown2WithGraph_async(AMD_TestIntf_checkPBSUnknown2WithGraph cb, Preserved p, Ice.Current current) { @@ -438,12 +468,14 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void exchangePNode_async(AMD_TestIntf_exchangePNode cb, PNode pn, Ice.Current current) { cb.ice_response(pn); } + @Override public void throwBaseAsBase_async(AMD_TestIntf_throwBaseAsBase cb, Ice.Current current) throws BaseException @@ -456,6 +488,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(be); } + @Override public void throwDerivedAsBase_async(AMD_TestIntf_throwDerivedAsBase cb, Ice.Current current) throws BaseException @@ -474,6 +507,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(de); } + @Override public void throwDerivedAsDerived_async(AMD_TestIntf_throwDerivedAsDerived cb, Ice.Current current) throws DerivedException @@ -492,6 +526,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(de); } + @Override public void throwUnknownDerivedAsBase_async(AMD_TestIntf_throwUnknownDerivedAsBase cb, Ice.Current current) throws BaseException @@ -510,6 +545,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ude); } + @Override public void throwPreservedException_async(AMD_TestIntf_throwPreservedException cb, Ice.Current current) { @@ -522,6 +558,7 @@ public final class AMDTestI extends _TestIntfDisp ue.p.pb = null; // Break the cycle. } + @Override public void useForward_async(AMD_TestIntf_useForward cb, Ice.Current current) { diff --git a/java/test/Ice/slicing/objects/AllTests.java b/java/test/Ice/slicing/objects/AllTests.java index a1dce237ad9..be43330eae1 100644 --- a/java/test/Ice/slicing/objects/AllTests.java +++ b/java/test/Ice/slicing/objects/AllTests.java @@ -9,7 +9,6 @@ package test.Ice.slicing.objects; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.slicing.objects.client.Test.*; @@ -62,6 +61,7 @@ public class AllTests private static class Callback_TestIntf_SBaseAsObjectI extends Callback_TestIntf_SBaseAsObject { + @Override public void response(Ice.Object o) { @@ -73,6 +73,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -80,12 +81,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -96,6 +91,7 @@ public class AllTests private static class Callback_TestIntf_SBaseAsSBaseI extends Callback_TestIntf_SBaseAsSBase { + @Override public void response(SBase sb) { @@ -103,6 +99,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -110,12 +107,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -126,6 +117,7 @@ public class AllTests private static class Callback_TestIntf_SBSKnownDerivedAsSBaseI extends Callback_TestIntf_SBSKnownDerivedAsSBase { + @Override public void response(SBase sb) { @@ -136,6 +128,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -143,12 +136,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -160,6 +147,7 @@ public class AllTests private static class Callback_TestIntf_SBSKnownDerivedAsSBSKnownDerivedI extends Callback_TestIntf_SBSKnownDerivedAsSBSKnownDerived { + @Override public void response(SBSKnownDerived sbskd) { @@ -167,6 +155,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -174,12 +163,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -190,6 +173,7 @@ public class AllTests private static class Callback_TestIntf_SBSUnknownDerivedAsSBaseI extends Callback_TestIntf_SBSUnknownDerivedAsSBase { + @Override public void response(SBase sb) { @@ -197,6 +181,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -204,12 +189,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -221,6 +200,7 @@ public class AllTests private static class Callback_TestIntf_SBSUnknownDerivedAsSBaseCompactI extends Callback_TestIntf_SBSUnknownDerivedAsSBaseCompact { + @Override public void response(SBase sb) { @@ -228,6 +208,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -240,12 +221,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -257,12 +232,14 @@ public class AllTests private static class Callback_TestIntf_SBSUnknownDerivedAsSBaseCompactFailI extends Callback_TestIntf_SBSUnknownDerivedAsSBaseCompact { + @Override public void response(SBase sb) { test(false); } + @Override public void exception(Ice.LocalException exc) { @@ -276,12 +253,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -292,12 +263,14 @@ public class AllTests private static class Callback_TestIntf_SUnknownAsObjectI1 extends Callback_TestIntf_SUnknownAsObject { + @Override public void response(Ice.Object o) { test(false); } + @Override public void exception(Ice.LocalException exc) { @@ -306,12 +279,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -322,6 +289,7 @@ public class AllTests private static class Callback_TestIntf_SUnknownAsObjectI2 extends Callback_TestIntf_SUnknownAsObject { + @Override public void response(Ice.Object o) { @@ -330,6 +298,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -337,12 +306,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -353,6 +316,7 @@ public class AllTests private static class Callback_TestIntf_oneElementCycleI extends Callback_TestIntf_oneElementCycle { + @Override public void response(B b) { @@ -363,6 +327,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -370,12 +335,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -386,6 +345,7 @@ public class AllTests private static class Callback_TestIntf_twoElementCycleI extends Callback_TestIntf_twoElementCycle { + @Override public void response(B b1) { @@ -401,6 +361,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -408,12 +369,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -424,6 +379,7 @@ public class AllTests private static class Callback_TestIntf_D1AsBI extends Callback_TestIntf_D1AsB { + @Override public void response(B b1) { @@ -447,6 +403,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -454,12 +411,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -470,6 +421,7 @@ public class AllTests private static class Callback_TestIntf_D1AsD1I extends Callback_TestIntf_D1AsD1 { + @Override public void response(D1 d1) { @@ -487,6 +439,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -494,12 +447,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -510,6 +457,7 @@ public class AllTests private static class Callback_TestIntf_D2AsBI extends Callback_TestIntf_D2AsB { + @Override public void response(B b2) { @@ -531,6 +479,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -538,12 +487,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -554,6 +497,7 @@ public class AllTests private static class Callback_TestIntf_paramTest1I extends Callback_TestIntf_paramTest1 { + @Override public void response(B b1, B b2) { @@ -573,6 +517,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -580,12 +525,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -596,6 +535,7 @@ public class AllTests private static class Callback_TestIntf_paramTest2I extends Callback_TestIntf_paramTest2 { + @Override public void response(B b2, B b1) { @@ -615,6 +555,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -622,12 +563,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -638,6 +573,7 @@ public class AllTests private static class Callback_TestIntf_returnTest1I extends Callback_TestIntf_returnTest1 { + @Override public void response(B r, B p1, B p2) { @@ -645,6 +581,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -652,12 +589,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -668,6 +599,7 @@ public class AllTests private static class Callback_TestIntf_returnTest2I extends Callback_TestIntf_returnTest2 { + @Override public void response(B r, B p1, B p2) { @@ -675,6 +607,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -682,12 +615,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -698,6 +625,7 @@ public class AllTests private static class Callback_TestIntf_returnTest3I extends Callback_TestIntf_returnTest3 { + @Override public void response(B b) { @@ -705,6 +633,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -712,12 +641,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -730,6 +653,7 @@ public class AllTests private static class Callback_TestIntf_paramTest3I extends Callback_TestIntf_paramTest3 { + @Override public void response(B ret, B p1, B p2) { @@ -750,6 +674,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -757,12 +682,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -773,6 +692,7 @@ public class AllTests private static class Callback_TestIntf_paramTest4I extends Callback_TestIntf_paramTest4 { + @Override public void response(B ret, B b) { @@ -788,6 +708,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -795,12 +716,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -811,6 +726,7 @@ public class AllTests private static class Callback_TestIntf_sequenceTestI extends Callback_TestIntf_sequenceTest { + @Override public void response(SS3 ss) { @@ -818,6 +734,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -825,12 +742,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -843,6 +754,7 @@ public class AllTests private static class Callback_TestIntf_dictionaryTestI extends Callback_TestIntf_dictionaryTest { + @Override public void response(java.util.Map<Integer, B> r, java.util.Map<Integer, B> bout) { @@ -851,6 +763,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -858,12 +771,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -877,18 +784,21 @@ public class AllTests private static class Callback_TestIntf_throwBaseAsBaseI extends Callback_TestIntf_throwBaseAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -919,18 +829,21 @@ public class AllTests private static class Callback_TestIntf_throwDerivedAsBaseI extends Callback_TestIntf_throwDerivedAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -967,18 +880,21 @@ public class AllTests private static class Callback_TestIntf_throwDerivedAsDerivedI extends Callback_TestIntf_throwDerivedAsDerived { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -1016,18 +932,21 @@ public class AllTests private static class Callback_TestIntf_throwUnknownDerivedAsBaseI extends Callback_TestIntf_throwUnknownDerivedAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -1058,6 +977,7 @@ public class AllTests private static class Callback_TestIntf_useForwardI extends Callback_TestIntf_useForward { + @Override public void response(Forward f) { @@ -1065,6 +985,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1072,12 +993,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1088,6 +1003,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI1 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1098,6 +1014,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1110,12 +1027,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1126,6 +1037,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI2 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1134,6 +1046,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1146,12 +1059,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1162,6 +1069,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI3 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1170,6 +1078,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1182,12 +1091,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1198,6 +1101,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI4 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1207,6 +1111,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1219,12 +1124,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1235,6 +1134,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseICompact1 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1243,6 +1143,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1255,12 +1156,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1271,6 +1166,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseICompact2 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1280,6 +1176,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1292,12 +1189,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1308,6 +1199,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI5 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1317,6 +1209,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1329,12 +1222,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1345,6 +1232,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI6 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1363,6 +1251,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1375,12 +1264,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1401,6 +1284,7 @@ public class AllTests private static class NodeFactoryI implements Ice.ObjectFactory { + @Override public Ice.Object create(String id) { if(id.equals(PNode.ice_staticId())) @@ -1410,6 +1294,7 @@ public class AllTests return null; } + @Override public void destroy() { } @@ -1427,6 +1312,7 @@ public class AllTests private static class PreservedFactoryI implements Ice.ObjectFactory { + @Override public Ice.Object create(String id) { if(id.equals(Preserved.ice_staticId())) @@ -1436,6 +1322,7 @@ public class AllTests return null; } + @Override public void destroy() { } @@ -1604,7 +1491,7 @@ public class AllTests // This test fails when using the compact format because the instance cannot // be sliced to a known type. // - SBase sb = test.SBSUnknownDerivedAsSBaseCompact(); + test.SBSUnknownDerivedAsSBaseCompact(); test(false); } catch(Ice.NoObjectFactoryException ex) @@ -2030,6 +1917,7 @@ public class AllTests try { D3 p3 = (D3)b2; + test(p3 != null); test(false); } catch(ClassCastException ex) @@ -2083,6 +1971,7 @@ public class AllTests try { D3 p3 = (D3)b2; + test(p3 != null); test(false); } catch(ClassCastException ex) @@ -2121,6 +2010,7 @@ public class AllTests try { D3 p1 = (D3)b1; + test(p1 != null); test(false); } catch(ClassCastException ex) @@ -2175,6 +2065,7 @@ public class AllTests try { D3 p1 = (D3)b1; + test(p1 != null); test(false); } catch(ClassCastException ex) @@ -3194,7 +3085,7 @@ public class AllTests c.next.next.next = c; test(PNodeI.counter == 0); - PNode n = test.exchangePNode(c); + test.exchangePNode(c); test(PNodeI.counter == 3); PNodeI.counter = 0; diff --git a/java/test/Ice/slicing/objects/Client.java b/java/test/Ice/slicing/objects/Client.java index 37e248f1f21..e725c725339 100644 --- a/java/test/Ice/slicing/objects/Client.java +++ b/java/test/Ice/slicing/objects/Client.java @@ -13,6 +13,7 @@ import test.Ice.slicing.objects.client.Test.TestIntfPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/objects/Server.java b/java/test/Ice/slicing/objects/Server.java index 20b9c86d8d1..fded6895de1 100644 --- a/java/test/Ice/slicing/objects/Server.java +++ b/java/test/Ice/slicing/objects/Server.java @@ -11,6 +11,7 @@ package test.Ice.slicing.objects; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/objects/TestI.java b/java/test/Ice/slicing/objects/TestI.java index 8fbe8b8c548..aa199bfdcbe 100644 --- a/java/test/Ice/slicing/objects/TestI.java +++ b/java/test/Ice/slicing/objects/TestI.java @@ -22,12 +22,14 @@ public final class TestI extends _TestIntfDisp } } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public Ice.Object SBaseAsObject(Ice.Current current) { @@ -36,6 +38,7 @@ public final class TestI extends _TestIntfDisp return sb; } + @Override public SBase SBaseAsSBase(Ice.Current current) { @@ -44,6 +47,7 @@ public final class TestI extends _TestIntfDisp return sb; } + @Override public SBase SBSKnownDerivedAsSBase(Ice.Current current) { @@ -53,6 +57,7 @@ public final class TestI extends _TestIntfDisp return sbskd; } + @Override public SBSKnownDerived SBSKnownDerivedAsSBSKnownDerived(Ice.Current current) { @@ -62,6 +67,7 @@ public final class TestI extends _TestIntfDisp return sbskd; } + @Override public SBase SBSUnknownDerivedAsSBase(Ice.Current current) { @@ -71,6 +77,7 @@ public final class TestI extends _TestIntfDisp return sbsud; } + @Override public SBase SBSUnknownDerivedAsSBaseCompact(Ice.Current current) { @@ -80,6 +87,7 @@ public final class TestI extends _TestIntfDisp return sbsud; } + @Override public Ice.Object SUnknownAsObject(Ice.Current current) { @@ -88,6 +96,7 @@ public final class TestI extends _TestIntfDisp return su; } + @Override public void checkSUnknown(Ice.Object obj, Ice.Current current) { @@ -102,6 +111,7 @@ public final class TestI extends _TestIntfDisp } } + @Override public B oneElementCycle(Ice.Current current) { @@ -111,6 +121,7 @@ public final class TestI extends _TestIntfDisp return b; } + @Override public B twoElementCycle(Ice.Current current) { @@ -123,6 +134,7 @@ public final class TestI extends _TestIntfDisp return b1; } + @Override public B D1AsB(Ice.Current current) { @@ -139,6 +151,7 @@ public final class TestI extends _TestIntfDisp return d1; } + @Override public D1 D1AsD1(Ice.Current current) { @@ -155,6 +168,7 @@ public final class TestI extends _TestIntfDisp return d1; } + @Override public B D2AsB(Ice.Current current) { @@ -171,6 +185,7 @@ public final class TestI extends _TestIntfDisp return d2; } + @Override public void paramTest1(BHolder p1, BHolder p2, Ice.Current current) { @@ -188,12 +203,14 @@ public final class TestI extends _TestIntfDisp p2.value = d2; } + @Override public void paramTest2(BHolder p1, BHolder p2, Ice.Current current) { paramTest1(p2, p1, current); } + @Override public B paramTest3(BHolder p1, BHolder p2, Ice.Current current) { @@ -226,6 +243,7 @@ public final class TestI extends _TestIntfDisp return d3; } + @Override public B paramTest4(BHolder p1, Ice.Current current) { @@ -240,6 +258,7 @@ public final class TestI extends _TestIntfDisp return d4.p2; } + @Override public B returnTest1(BHolder p1, BHolder p2, Ice.Current current) { @@ -248,6 +267,7 @@ public final class TestI extends _TestIntfDisp return p1.value; } + @Override public B returnTest2(BHolder p1, BHolder p2, Ice.Current current) { @@ -256,12 +276,14 @@ public final class TestI extends _TestIntfDisp return p1.value; } + @Override public B returnTest3(B p1, B p2, Ice.Current current) { return p1; } + @Override public SS3 sequenceTest(SS1 p1, SS2 p2, Ice.Current current) { @@ -271,6 +293,7 @@ public final class TestI extends _TestIntfDisp return ss; } + @Override public java.util.Map<Integer, B> dictionaryTest(java.util.Map<Integer, B> bin, BDictHolder bout, Ice.Current current) { @@ -300,12 +323,14 @@ public final class TestI extends _TestIntfDisp return r; } + @Override public PBase exchangePBase(PBase pb, Ice.Current current) { return pb; } + @Override public Preserved PBSUnknownAsPreserved(Ice.Current current) { @@ -325,6 +350,7 @@ public final class TestI extends _TestIntfDisp return r; } + @Override public void checkPBSUnknown(Preserved p, Ice.Current current) { @@ -345,6 +371,7 @@ public final class TestI extends _TestIntfDisp } } + @Override public void PBSUnknownAsPreservedWithGraph_async(AMD_TestIntf_PBSUnknownAsPreservedWithGraph cb, Ice.Current current) { @@ -360,6 +387,7 @@ public final class TestI extends _TestIntfDisp r.graph.next.next.next = null; // Break the cycle. } + @Override public void checkPBSUnknownWithGraph(Preserved p, Ice.Current current) { @@ -382,6 +410,7 @@ public final class TestI extends _TestIntfDisp } } + @Override public void PBSUnknown2AsPreservedWithGraph_async(AMD_TestIntf_PBSUnknown2AsPreservedWithGraph cb, Ice.Current current) { @@ -393,6 +422,7 @@ public final class TestI extends _TestIntfDisp r.pb = null; // Break the cycle. } + @Override public void checkPBSUnknown2WithGraph(Preserved p, Ice.Current current) { @@ -412,12 +442,14 @@ public final class TestI extends _TestIntfDisp } } + @Override public PNode exchangePNode(PNode pn, Ice.Current current) { return pn; } + @Override public void throwBaseAsBase(Ice.Current current) throws BaseException @@ -430,6 +462,7 @@ public final class TestI extends _TestIntfDisp throw be; } + @Override public void throwDerivedAsBase(Ice.Current current) throws BaseException @@ -448,6 +481,7 @@ public final class TestI extends _TestIntfDisp throw de; } + @Override public void throwDerivedAsDerived(Ice.Current current) throws DerivedException @@ -466,6 +500,7 @@ public final class TestI extends _TestIntfDisp throw de; } + @Override public void throwUnknownDerivedAsBase(Ice.Current current) throws BaseException @@ -484,6 +519,7 @@ public final class TestI extends _TestIntfDisp throw ude; } + @Override public void throwPreservedException_async(AMD_TestIntf_throwPreservedException cb, Ice.Current current) { @@ -496,6 +532,7 @@ public final class TestI extends _TestIntfDisp ue.p.pb = null; // Break the cycle. } + @Override public void useForward(ForwardHolder f, Ice.Current current) { diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java index aab00a15d50..5d88f303e5d 100644 --- a/java/test/Ice/stream/Client.java +++ b/java/test/Ice/stream/Client.java @@ -21,8 +21,6 @@ import Ice.LongSeqHelper; import Ice.StringSeqHelper; import test.Ice.stream.Test.*; -import java.io.PrintWriter; - public class Client extends test.Util.Application { private static void @@ -41,6 +39,7 @@ public class Client extends test.Util.Application this.obj = obj; } + @Override public void write(Ice.OutputStream out) { @@ -54,6 +53,7 @@ public class Client extends test.Util.Application private static class TestObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { @@ -68,6 +68,7 @@ public class Client extends test.Util.Application private static class TestObjectFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { @@ -75,6 +76,7 @@ public class Client extends test.Util.Application return new TestObjectReader(); } + @Override public void destroy() { @@ -87,6 +89,7 @@ public class Client extends test.Util.Application private static class MyInterfaceFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { @@ -94,6 +97,7 @@ public class Client extends test.Util.Application return new MyInterfaceI(); } + @Override public void destroy() { @@ -102,6 +106,7 @@ public class Client extends test.Util.Application private static class TestReadObjectCallback implements Ice.ReadObjectCallback { + @Override public void invoke(Ice.Object obj) { @@ -118,12 +123,14 @@ public class Client extends test.Util.Application _factory = MyClass.ice_factory(); } + @Override public Ice.Object create(String type) { return _factory.create(type); } + @Override public void destroy() { @@ -145,6 +152,7 @@ public class Client extends test.Util.Application private Ice.ObjectFactory _factory; } + @Override public int run(String[] args) { @@ -554,10 +562,10 @@ public class Client extends test.Util.Application { final float[] arr = { - (float)1, - (float)2, - (float)3, - (float)4 + 1, + 2, + 3, + 4 }; out = Ice.Util.createOutputStream(comm); FloatSeqHelper.write(out, arr); @@ -587,10 +595,10 @@ public class Client extends test.Util.Application { final double[] arr = { - (double)1, - (double)2, - (double)3, - (double)4 + 1, + 2, + 3, + 4 }; out = Ice.Util.createOutputStream(comm); DoubleSeqHelper.write(out, arr); @@ -697,8 +705,8 @@ public class Client extends test.Util.Application arr[i].seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 }; arr[i].seq4 = new int[] { 1, 2, 3, 4 }; arr[i].seq5 = new long[] { 1, 2, 3, 4 }; - arr[i].seq6 = new float[] { (float)1, (float)2, (float)3, (float)4 }; - arr[i].seq7 = new double[] { (double)1, (double)2, (double)3, (double)4 }; + arr[i].seq6 = new float[] { 1, 2, 3, 4 }; + arr[i].seq7 = new double[] { 1, 2, 3, 4 }; arr[i].seq8 = new String[] { "string1", "string2", "string3", "string4" }; arr[i].seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 }; arr[i].seq10 = new MyClass[4]; // null elements. @@ -773,7 +781,7 @@ public class Client extends test.Util.Application TestObjectWriter writer = new TestObjectWriter(obj); out.writeObject(writer); out.writePendingObjects(); - byte[] data = out.finished(); + out.finished(); test(writer.called); out.destroy(); } @@ -818,8 +826,8 @@ public class Client extends test.Util.Application c.seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 }; c.seq4 = new int[] { 1, 2, 3, 4 }; c.seq5 = new long[] { 1, 2, 3, 4 }; - c.seq6 = new float[] { (float)1, (float)2, (float)3, (float)4 }; - c.seq7 = new double[] { (double)1, (double)2, (double)3, (double)4 }; + c.seq6 = new float[] { 1, 2, 3, 4 }; + c.seq7 = new double[] { 1, 2, 3, 4 }; c.seq8 = new String[] { "string1", "string2", "string3", "string4" }; c.seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 }; c.seq10 = new MyClass[4]; // null elements. @@ -883,8 +891,8 @@ public class Client extends test.Util.Application { java.util.Map<Long, Float> dict = new java.util.HashMap<Long, Float>(); - dict.put((long)123809828, (float)0.51f); - dict.put((long)123809829, (float)0.56f); + dict.put((long)123809828, 0.51f); + dict.put((long)123809829, 0.56f); out = Ice.Util.createOutputStream(comm); LongFloatDHelper.write(out, dict); byte data[] = out.finished(); @@ -933,6 +941,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/threadPoolPriority/Client.java b/java/test/Ice/threadPoolPriority/Client.java index e81a6f2c6b4..86dd9468d47 100644 --- a/java/test/Ice/threadPoolPriority/Client.java +++ b/java/test/Ice/threadPoolPriority/Client.java @@ -23,6 +23,7 @@ public class Client extends test.Util.Application } } + @Override public int run(String[] args) { java.io.PrintWriter out = getWriter(); diff --git a/java/test/Ice/threadPoolPriority/PriorityI.java b/java/test/Ice/threadPoolPriority/PriorityI.java index ea28df2425d..18579e7713a 100644 --- a/java/test/Ice/threadPoolPriority/PriorityI.java +++ b/java/test/Ice/threadPoolPriority/PriorityI.java @@ -6,11 +6,13 @@ import test.Ice.threadPoolPriority.Test._PriorityDisp; public class PriorityI extends _PriorityDisp { + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public int getPriority(Ice.Current current) { return Thread.currentThread().getPriority(); diff --git a/java/test/Ice/threadPoolPriority/Server.java b/java/test/Ice/threadPoolPriority/Server.java index 3da81c77ffd..a1bdc6a0a31 100644 --- a/java/test/Ice/threadPoolPriority/Server.java +++ b/java/test/Ice/threadPoolPriority/Server.java @@ -11,6 +11,7 @@ package test.Ice.threadPoolPriority; public class Server extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); @@ -22,6 +23,7 @@ public class Server extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/throughput/Client.java b/java/test/Ice/throughput/Client.java index 311ae4b210a..b508b11bc96 100644 --- a/java/test/Ice/throughput/Client.java +++ b/java/test/Ice/throughput/Client.java @@ -24,6 +24,7 @@ public class Client extends test.Util.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -62,6 +63,7 @@ public class Client extends test.Util.Application "?: help\n"); } + @Override public int run(String[] args) { @@ -156,8 +158,6 @@ public class Client extends test.Util.Application menu(); - java.io.BufferedReader in = new java.io.BufferedReader(new java.io.InputStreamReader(System.in)); - char currentType = '1'; int seqSize = ByteSeqSize.value; @@ -171,13 +171,6 @@ public class Client extends test.Util.Application { try { - //out.print("==> "); - //out.flush(); - //line = in.readLine(); - //if(line == null) - //{ - // break; - //} line = input[inputIndex++]; long tmsec = System.currentTimeMillis(); @@ -480,6 +473,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/throughput/Server.java b/java/test/Ice/throughput/Server.java index a568de642d0..95737f3dc10 100644 --- a/java/test/Ice/throughput/Server.java +++ b/java/test/Ice/throughput/Server.java @@ -11,6 +11,7 @@ package test.Ice.throughput; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/throughput/ThroughputI.java b/java/test/Ice/throughput/ThroughputI.java index 44a85e55521..53253549102 100644 --- a/java/test/Ice/throughput/ThroughputI.java +++ b/java/test/Ice/throughput/ThroughputI.java @@ -48,6 +48,7 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public boolean needsWarmup(Ice.Current current) { @@ -55,12 +56,14 @@ public final class ThroughputI extends _ThroughputDisp return _needsWarmup; } + @Override public void startWarmup(Ice.Current current) { _warmup = true; } + @Override public void endWarmup(Ice.Current current) { @@ -68,11 +71,13 @@ public final class ThroughputI extends _ThroughputDisp _needsWarmup = false; } + @Override public void sendByteSeq(byte[] seq, Ice.Current current) { } + @Override public byte[] recvByteSeq(Ice.Current current) { @@ -86,17 +91,20 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public byte[] echoByteSeq(byte[] seq, Ice.Current current) { return seq; } + @Override public void sendStringSeq(String[] seq, Ice.Current current) { } + @Override public String[] recvStringSeq(Ice.Current current) { @@ -110,17 +118,20 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public String[] echoStringSeq(String[] seq, Ice.Current current) { return seq; } + @Override public void sendStructSeq(StringDouble[] seq, Ice.Current current) { } + @Override public StringDouble[] recvStructSeq(Ice.Current current) { @@ -134,17 +145,20 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public StringDouble[] echoStructSeq(StringDouble[] seq, Ice.Current current) { return seq; } + @Override public void sendFixedSeq(Fixed[] seq, Ice.Current current) { } + @Override public Fixed[] recvFixedSeq(Ice.Current current) { @@ -158,12 +172,14 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public Fixed[] echoFixedSeq(Fixed[] seq, Ice.Current current) { return seq; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/timeout/AllTests.java b/java/test/Ice/timeout/AllTests.java index 4d09a6885b8..46dd8e00452 100644 --- a/java/test/Ice/timeout/AllTests.java +++ b/java/test/Ice/timeout/AllTests.java @@ -62,6 +62,7 @@ public class AllTests private static class CallbackSuccess extends Ice.Callback { + @Override public void completed(Ice.AsyncResult result) { @@ -95,6 +96,7 @@ public class AllTests private static class CallbackFail extends Ice.Callback { + @Override public void completed(Ice.AsyncResult result) { @@ -314,7 +316,6 @@ public class AllTests // Test Ice.Override.Timeout. This property overrides all // endpoint timeouts. // - String[] args = new String[0]; Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.Timeout", "250"); @@ -351,7 +352,6 @@ public class AllTests // // Test Ice.Override.ConnectTimeout. // - String[] args = new String[0]; Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.ConnectTimeout", "250"); @@ -409,7 +409,7 @@ public class AllTests initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.CloseTimeout", "200"); Ice.Communicator comm = app.initialize(initData); - Ice.Connection connection = comm.stringToProxy(sref).ice_getConnection(); + comm.stringToProxy(sref).ice_getConnection(); timeout.holdAdapter(750); long now = System.nanoTime(); comm.destroy(); diff --git a/java/test/Ice/timeout/Client.java b/java/test/Ice/timeout/Client.java index 95b21ce370b..7476eb5c0e8 100644 --- a/java/test/Ice/timeout/Client.java +++ b/java/test/Ice/timeout/Client.java @@ -13,6 +13,7 @@ import test.Ice.timeout.Test.TimeoutPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { TimeoutPrx timeout = AllTests.allTests(this); @@ -20,6 +21,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/timeout/Server.java b/java/test/Ice/timeout/Server.java index a77c8323348..b4006770863 100644 --- a/java/test/Ice/timeout/Server.java +++ b/java/test/Ice/timeout/Server.java @@ -11,6 +11,7 @@ package test.Ice.timeout; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/timeout/TimeoutI.java b/java/test/Ice/timeout/TimeoutI.java index d6b1b496b44..61b8f7702c2 100644 --- a/java/test/Ice/timeout/TimeoutI.java +++ b/java/test/Ice/timeout/TimeoutI.java @@ -21,6 +21,7 @@ class TimeoutI extends _TimeoutDisp _timeout = timeout; } + @Override public void run() { @@ -39,28 +40,33 @@ class TimeoutI extends _TimeoutDisp int _timeout; } + @Override public void op(Ice.Current current) { } + @Override public void sendData(byte[] seq, Ice.Current current) { } + @Override public void sleep(int to, Ice.Current current) { try { - Thread.currentThread().sleep(to); + Thread.currentThread(); + Thread.sleep(to); } catch(InterruptedException ex) { } } + @Override public void holdAdapter(int to, Ice.Current current) { @@ -69,6 +75,7 @@ class TimeoutI extends _TimeoutDisp thread.start(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/udp/AllTests.java b/java/test/Ice/udp/AllTests.java index da4395e24db..82dc1224d46 100644 --- a/java/test/Ice/udp/AllTests.java +++ b/java/test/Ice/udp/AllTests.java @@ -24,6 +24,7 @@ public class AllTests public static class PingReplyI extends _PingReplyDisp { + @Override public synchronized void reply(Ice.Current current) { diff --git a/java/test/Ice/udp/Client.java b/java/test/Ice/udp/Client.java index 7c194afa821..afd4927a470 100644 --- a/java/test/Ice/udp/Client.java +++ b/java/test/Ice/udp/Client.java @@ -13,6 +13,7 @@ import test.Ice.udp.Test.*; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(communicator()); @@ -33,6 +34,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/udp/Server.java b/java/test/Ice/udp/Server.java index e5dc60e202e..05cfc43cbc8 100644 --- a/java/test/Ice/udp/Server.java +++ b/java/test/Ice/udp/Server.java @@ -11,6 +11,7 @@ package test.Ice.udp; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Properties properties = communicator().getProperties(); @@ -43,6 +44,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/udp/TestIntfI.java b/java/test/Ice/udp/TestIntfI.java index b4608f1c463..d4aba78a2c3 100644 --- a/java/test/Ice/udp/TestIntfI.java +++ b/java/test/Ice/udp/TestIntfI.java @@ -13,6 +13,7 @@ import test.Ice.udp.Test.*; public final class TestIntfI extends _TestIntfDisp { + @Override public void ping(PingReplyPrx reply, Ice.Current current) { try @@ -25,6 +26,7 @@ public final class TestIntfI extends _TestIntfDisp } } + @Override public void sendByteSeq(byte[] seq, PingReplyPrx reply, Ice.Current current) { try @@ -37,6 +39,7 @@ public final class TestIntfI extends _TestIntfDisp } } + @Override public void pingBiDir(Ice.Identity id, Ice.Current current) { try @@ -63,6 +66,7 @@ public final class TestIntfI extends _TestIntfDisp } } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); diff --git a/java/test/IceBox/admin/Client.java b/java/test/IceBox/admin/Client.java index 0e8211572db..80664c2edd0 100644 --- a/java/test/IceBox/admin/Client.java +++ b/java/test/IceBox/admin/Client.java @@ -9,8 +9,6 @@ package test.IceBox.admin; -import test.IceBox.admin.Test.*; - public class Client { private static int diff --git a/java/test/IceBox/admin/TestFacetI.java b/java/test/IceBox/admin/TestFacetI.java index cfdf812860b..642ee400d20 100644 --- a/java/test/IceBox/admin/TestFacetI.java +++ b/java/test/IceBox/admin/TestFacetI.java @@ -18,6 +18,7 @@ public class TestFacetI extends _TestFacetDisp implements Ice.PropertiesAdminUpd _called = false; } + @Override public synchronized java.util.Map<String, String> getChanges(Ice.Current current) { // @@ -43,6 +44,7 @@ public class TestFacetI extends _TestFacetDisp implements Ice.PropertiesAdminUpd return _changes; } + @Override public synchronized void updated(java.util.Map<String, String> changes) { _changes = changes; diff --git a/java/test/IceBox/admin/TestServiceI.java b/java/test/IceBox/admin/TestServiceI.java index 9536849988a..7497771d248 100644 --- a/java/test/IceBox/admin/TestServiceI.java +++ b/java/test/IceBox/admin/TestServiceI.java @@ -32,11 +32,13 @@ public class TestServiceI implements IceBox.Service } } + @Override public void start(String name, Ice.Communicator communicator, String[] args) { } + @Override public void stop() { diff --git a/java/test/IceBox/configuration/Client.java b/java/test/IceBox/configuration/Client.java index a8c3f9a29a7..39785e9de8a 100644 --- a/java/test/IceBox/configuration/Client.java +++ b/java/test/IceBox/configuration/Client.java @@ -11,6 +11,7 @@ package test.IceBox.configuration; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -24,6 +25,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/IceBox/configuration/TestI.java b/java/test/IceBox/configuration/TestI.java index 55dc8df43b1..abe96b912f8 100644 --- a/java/test/IceBox/configuration/TestI.java +++ b/java/test/IceBox/configuration/TestI.java @@ -20,12 +20,14 @@ public class TestI extends _TestIntfDisp _args = args; } + @Override public String getProperty(String name, Ice.Current current) { return current.adapter.getCommunicator().getProperties().getProperty(name); } + @Override public String[] getArgs(Ice.Current current) { diff --git a/java/test/IceBox/configuration/TestServiceI.java b/java/test/IceBox/configuration/TestServiceI.java index 1ec7d175845..037d5465968 100644 --- a/java/test/IceBox/configuration/TestServiceI.java +++ b/java/test/IceBox/configuration/TestServiceI.java @@ -11,6 +11,7 @@ package test.IceBox.configuration; public class TestServiceI implements IceBox.Service { + @Override public void start(String name, Ice.Communicator communicator, String[] args) { @@ -21,6 +22,7 @@ public class TestServiceI implements IceBox.Service adapter.activate(); } + @Override public void stop() { diff --git a/java/test/IceDiscovery/simple/Client.java b/java/test/IceDiscovery/simple/Client.java index fda8e46a37d..7b93371328e 100644 --- a/java/test/IceDiscovery/simple/Client.java +++ b/java/test/IceDiscovery/simple/Client.java @@ -11,6 +11,7 @@ package test.IceDiscovery.simple; public class Client extends test.Util.Application { + @Override public int run(String[] args) { int num; diff --git a/java/test/IceDiscovery/simple/ControllerI.java b/java/test/IceDiscovery/simple/ControllerI.java index 1c8c2d837c7..188b1c7182d 100644 --- a/java/test/IceDiscovery/simple/ControllerI.java +++ b/java/test/IceDiscovery/simple/ControllerI.java @@ -13,6 +13,7 @@ import test.IceDiscovery.simple.Test.*; public final class ControllerI extends _ControllerDisp { + @Override public void activateObjectAdapter(String name, String adapterId, String replicaGroupId, Ice.Current current) { @@ -26,6 +27,7 @@ public final class ControllerI extends _ControllerDisp oa.activate(); } + @Override public void deactivateObjectAdapter(String name, Ice.Current current) { @@ -33,6 +35,7 @@ public final class ControllerI extends _ControllerDisp _adapters.remove(name); } + @Override public void addObject(String oaName, String id, Ice.Current current) { @@ -42,6 +45,7 @@ public final class ControllerI extends _ControllerDisp _adapters.get(oaName).add(new TestIntfI(), identity); } + @Override public void removeObject(String oaName, String id, Ice.Current current) { @@ -51,6 +55,7 @@ public final class ControllerI extends _ControllerDisp _adapters.get(oaName).remove(identity); } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); diff --git a/java/test/IceDiscovery/simple/Server.java b/java/test/IceDiscovery/simple/Server.java index 5a671e99003..7bc444355f4 100644 --- a/java/test/IceDiscovery/simple/Server.java +++ b/java/test/IceDiscovery/simple/Server.java @@ -11,6 +11,7 @@ package test.IceDiscovery.simple; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Properties properties = communicator().getProperties(); diff --git a/java/test/IceDiscovery/simple/TestIntfI.java b/java/test/IceDiscovery/simple/TestIntfI.java index fca6235ce6b..339bc281081 100644 --- a/java/test/IceDiscovery/simple/TestIntfI.java +++ b/java/test/IceDiscovery/simple/TestIntfI.java @@ -13,6 +13,7 @@ import test.IceDiscovery.simple.Test.*; public final class TestIntfI extends _TestIntfDisp { + @Override public String getAdapterId(Ice.Current current) { diff --git a/java/test/IceGrid/simple/Client.java b/java/test/IceGrid/simple/Client.java index fc162e87c86..0da92bbeffe 100644 --- a/java/test/IceGrid/simple/Client.java +++ b/java/test/IceGrid/simple/Client.java @@ -11,6 +11,7 @@ package test.IceGrid.simple; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -36,6 +37,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/IceGrid/simple/Server.java b/java/test/IceGrid/simple/Server.java index 9ad433104ce..1b349a70773 100644 --- a/java/test/IceGrid/simple/Server.java +++ b/java/test/IceGrid/simple/Server.java @@ -11,6 +11,7 @@ package test.IceGrid.simple; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -34,6 +35,7 @@ public class Server extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/IceGrid/simple/TestI.java b/java/test/IceGrid/simple/TestI.java index a45d06375fc..82ba95b7aad 100644 --- a/java/test/IceGrid/simple/TestI.java +++ b/java/test/IceGrid/simple/TestI.java @@ -18,6 +18,7 @@ public class TestI extends _TestIntfDisp { } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/IceSSL/configuration/CertificateVerifierI.java b/java/test/IceSSL/configuration/CertificateVerifierI.java index 624e3c0fb9e..03ae75ad659 100644 --- a/java/test/IceSSL/configuration/CertificateVerifierI.java +++ b/java/test/IceSSL/configuration/CertificateVerifierI.java @@ -8,7 +8,6 @@ // ********************************************************************** package test.IceSSL.configuration; -import test.IceSSL.configuration.Test.*; public class CertificateVerifierI implements IceSSL.CertificateVerifier { @@ -18,6 +17,7 @@ public class CertificateVerifierI implements IceSSL.CertificateVerifier reset(); } + @Override public boolean verify(IceSSL.NativeConnectionInfo info) { diff --git a/java/test/IceSSL/configuration/Client.java b/java/test/IceSSL/configuration/Client.java index 100ad55f352..36ecfde860d 100644 --- a/java/test/IceSSL/configuration/Client.java +++ b/java/test/IceSSL/configuration/Client.java @@ -15,6 +15,7 @@ import test.IceSSL.configuration.Test.ServerFactoryPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { PrintWriter out = getWriter(); @@ -30,6 +31,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/IceSSL/configuration/PasswordCallbackI.java b/java/test/IceSSL/configuration/PasswordCallbackI.java index 5a916add5d5..b7493caaffc 100644 --- a/java/test/IceSSL/configuration/PasswordCallbackI.java +++ b/java/test/IceSSL/configuration/PasswordCallbackI.java @@ -8,7 +8,6 @@ // ********************************************************************** package test.IceSSL.configuration; -import test.IceSSL.configuration.Test.*; public class PasswordCallbackI implements IceSSL.PasswordCallback { @@ -24,18 +23,21 @@ public class PasswordCallbackI implements IceSSL.PasswordCallback _password = password; } + @Override public char[] getPassword(String alias) { return _password.toCharArray(); } + @Override public char[] getTruststorePassword() { return null; } + @Override public char[] getKeystorePassword() { diff --git a/java/test/IceSSL/configuration/Server.java b/java/test/IceSSL/configuration/Server.java index 257ab531526..9438f73d419 100644 --- a/java/test/IceSSL/configuration/Server.java +++ b/java/test/IceSSL/configuration/Server.java @@ -12,6 +12,7 @@ package test.IceSSL.configuration; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -25,6 +26,7 @@ public class Server extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/IceSSL/configuration/ServerFactoryI.java b/java/test/IceSSL/configuration/ServerFactoryI.java index ea2a01b5f29..34271e03f89 100644 --- a/java/test/IceSSL/configuration/ServerFactoryI.java +++ b/java/test/IceSSL/configuration/ServerFactoryI.java @@ -23,6 +23,7 @@ class ServerFactoryI extends _ServerFactoryDisp } } + @Override public ServerPrx createServer(java.util.Map<String, String> props, Ice.Current current) { @@ -44,6 +45,7 @@ class ServerFactoryI extends _ServerFactoryDisp return ServerPrxHelper.uncheckedCast(obj); } + @Override public void destroyServer(ServerPrx srv, Ice.Current current) { @@ -56,6 +58,7 @@ class ServerFactoryI extends _ServerFactoryDisp } } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/IceSSL/configuration/ServerI.java b/java/test/IceSSL/configuration/ServerI.java index 300f29396b2..ca3e2835e23 100644 --- a/java/test/IceSSL/configuration/ServerI.java +++ b/java/test/IceSSL/configuration/ServerI.java @@ -17,6 +17,7 @@ class ServerI extends _ServerDisp _communicator = communicator; } + @Override public void noCert(Ice.Current current) { @@ -31,6 +32,7 @@ class ServerI extends _ServerDisp } } + @Override public void checkCert(String subjectDN, String issuerDN, Ice.Current current) { @@ -48,6 +50,7 @@ class ServerI extends _ServerDisp } } + @Override public void checkCipher(String cipher, Ice.Current current) { diff --git a/java/test/IceUtil/fileLock/Client.java b/java/test/IceUtil/fileLock/Client.java index e1fddd96634..ce67ad3fe50 100644 --- a/java/test/IceUtil/fileLock/Client.java +++ b/java/test/IceUtil/fileLock/Client.java @@ -46,7 +46,7 @@ public class Client BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); try { - String dummy = br.readLine(); + br.readLine(); } catch(java.io.IOException ex) { diff --git a/java/test/IceUtil/fileLock/ClientFail.java b/java/test/IceUtil/fileLock/ClientFail.java index fc88898b0e5..c96dc7c9b57 100644 --- a/java/test/IceUtil/fileLock/ClientFail.java +++ b/java/test/IceUtil/fileLock/ClientFail.java @@ -9,9 +9,6 @@ package test.IceUtil.fileLock; -import java.io.BufferedReader; -import java.io.InputStreamReader; - import java.io.File; import java.io.RandomAccessFile; import java.io.EOFException; @@ -33,10 +30,10 @@ public class ClientFail public static void main(String[] argvs) { - IceUtilInternal.FileLock lock = null; + try { - lock = new IceUtilInternal.FileLock("file.lock"); + new IceUtilInternal.FileLock("file.lock"); test(false); } catch(IceUtil.FileLockException ex) @@ -52,7 +49,14 @@ public class ClientFail try { RandomAccessFile file = new RandomAccessFile(new File("file.lock"), "r"); - pid = file.readUTF(); + try + { + pid = file.readUTF(); + } + finally + { + file.close(); + } } catch(EOFException eofEx) { diff --git a/java/test/Slice/keyword/Client.java b/java/test/Slice/keyword/Client.java index e79338a3d2b..df96ebc985f 100644 --- a/java/test/Slice/keyword/Client.java +++ b/java/test/Slice/keyword/Client.java @@ -38,6 +38,7 @@ public class Client { } + @Override public void checkedCast_async(AMD_catch_checkedCast __cb, int _clone, Ice.Current __current) { @@ -53,6 +54,7 @@ public class Client { } + @Override public void _do(Ice.Current __current) { @@ -67,6 +69,7 @@ public class Client { } + @Override public void foo(defaultPrx _equals, Ice.IntHolder _final, Ice.Current __current) { @@ -80,6 +83,7 @@ public class Client { } + @Override public _assert _notify(_break _notifyAll, _else _null, _finalize _package, elsePrx _private, finalizePrx _protected, @@ -97,6 +101,7 @@ public class Client { } + @Override public void checkedCast_async(AMD_catch_checkedCast __cb, int _clone, Ice.Current __current) { @@ -104,11 +109,13 @@ public class Client __cb.ice_response(_continue); } + @Override public void _do(Ice.Current __current) { } + @Override public void foo(defaultPrx _equals, Ice.IntHolder _final, Ice.Current __current) { @@ -119,6 +126,7 @@ public class Client // This section of the test is present to ensure that the C++ types // are named correctly. It is not expected to run. // + @SuppressWarnings({ "unused", "null" }) private static void testtypes() { diff --git a/java/test/Slice/structure/Client.java b/java/test/Slice/structure/Client.java index 10cd8fc2f3f..74f2239ae2e 100644 --- a/java/test/Slice/structure/Client.java +++ b/java/test/Slice/structure/Client.java @@ -130,7 +130,7 @@ public class Client S2 v1, v2; v1 = (S2)def_s2.clone(); - v1.ss = (String[])def_s2.ss.clone(); + v1.ss = def_s2.ss.clone(); test(v1.equals(def_s2)); v1 = (S2)def_s2.clone(); |