diff options
Diffstat (limited to 'java-compat/test/src')
53 files changed, 232 insertions, 232 deletions
diff --git a/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java b/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java index 0fa9ebbea82..52a7aa4a75e 100644 --- a/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java +++ b/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java @@ -29,7 +29,7 @@ public class Client extends test.Util.Application throw new RuntimeException(); } } - + public class WorkQueue extends Thread { @Override @@ -110,7 +110,7 @@ public class Client extends test.Util.Application String host = getTestHost(); _workQueue = new WorkQueue(); _workQueue.start(); - + _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback() { @Override @@ -570,7 +570,7 @@ public class Client extends test.Util.Application _session.destroy(); out.println("ok"); } - + _workQueue._destroy(); return 0; diff --git a/java-compat/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java b/java-compat/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java index 112ee689fe3..26f7dba4aaa 100644 --- a/java-compat/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java +++ b/java-compat/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java @@ -26,7 +26,7 @@ public class RemoteObjectAdapterI extends _RemoteObjectAdapterDisp { return _testIntf; } - + public void activate(Ice.Current current) { _adapter.activate(); diff --git a/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java b/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java index 4f4fe3c1697..84d2e0685ea 100644 --- a/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java +++ b/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java @@ -50,7 +50,7 @@ public class RemoteCommunicatorFactoryI extends _RemoteCommunicatorFactoryDisp { return "NullLogger"; } - + @Override public Ice.Logger cloneWithPrefix(String prefix) { return this; diff --git a/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java b/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java index bb1adecab93..c33b42ad4d2 100644 --- a/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java +++ b/java-compat/test/src/main/java/test/Ice/admin/RemoteCommunicatorI.java @@ -56,7 +56,7 @@ public class RemoteCommunicatorI extends _RemoteCommunicatorDisp implements Ice. { _communicator.getLogger().print(message); } - + @Override public void trace(String category, String message, Ice.Current current) { diff --git a/java-compat/test/src/main/java/test/Ice/admin/RemoteLoggerI.java b/java-compat/test/src/main/java/test/Ice/admin/RemoteLoggerI.java index ffb82e10181..d18120b38c5 100644 --- a/java-compat/test/src/main/java/test/Ice/admin/RemoteLoggerI.java +++ b/java-compat/test/src/main/java/test/Ice/admin/RemoteLoggerI.java @@ -27,7 +27,7 @@ class RemoteLoggerI extends Ice._RemoteLoggerDisp Ice.LogMessage front = _expectedLogMessages.pollFirst(); test(front.type == logMessage.type && front.message.equals(logMessage.message) && front.traceCategory.equals(logMessage.traceCategory)); - + _receivedCalls++; notifyAll(); } @@ -37,7 +37,7 @@ class RemoteLoggerI extends Ice._RemoteLoggerDisp _expectedPrefix = prefix; _expectedInitMessages = logMessages; } - + synchronized void checkNextLog(Ice.LogMessageType messageType, String message, String category) { Ice.LogMessage logMessage = new Ice.LogMessage(messageType, 0, category, message); diff --git a/java-compat/test/src/main/java/test/Ice/admin/Test.ice b/java-compat/test/src/main/java/test/Ice/admin/Test.ice index bcea8d08443..39247b4b209 100644 --- a/java-compat/test/src/main/java/test/Ice/admin/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/admin/Test.ice @@ -21,7 +21,7 @@ interface RemoteCommunicator Object* getAdmin(); Ice::PropertyDict getChanges(); - + // // Logger operations // diff --git a/java-compat/test/src/main/java/test/Ice/ami/TestControllerI.java b/java-compat/test/src/main/java/test/Ice/ami/TestControllerI.java index 280ef291f57..01c7958f24b 100644 --- a/java-compat/test/src/main/java/test/Ice/ami/TestControllerI.java +++ b/java-compat/test/src/main/java/test/Ice/ami/TestControllerI.java @@ -18,14 +18,14 @@ class TestControllerI extends _TestIntfControllerDisp { _adapter.hold(); } - + @Override public void resumeAdapter(Ice.Current current) { _adapter.activate(); } - + public TestControllerI(Ice.ObjectAdapter adapter) { diff --git a/java-compat/test/src/main/java/test/Ice/background/BackgroundControllerI.java b/java-compat/test/src/main/java/test/Ice/background/BackgroundControllerI.java index 550e9748817..5628d4bbe00 100644 --- a/java-compat/test/src/main/java/test/Ice/background/BackgroundControllerI.java +++ b/java-compat/test/src/main/java/test/Ice/background/BackgroundControllerI.java @@ -49,14 +49,14 @@ class BackgroundControllerI extends _BackgroundControllerDisp { _adapter.hold(); } - + @Override public void resumeAdapter(Ice.Current current) { _adapter.activate(); } - + @Override public void initializeSocketStatus(int status, Ice.Current current) @@ -84,7 +84,7 @@ class BackgroundControllerI extends _BackgroundControllerDisp { _configuration.readException(enable ? new Ice.SocketException() : null); } - + @Override public void writeReady(boolean enable, Ice.Current current) @@ -105,7 +105,7 @@ class BackgroundControllerI extends _BackgroundControllerDisp { _configuration.buffered(enable); } - + public BackgroundControllerI(Configuration configuration, Ice.ObjectAdapter adapter) { diff --git a/java-compat/test/src/main/java/test/Ice/background/Configuration.java b/java-compat/test/src/main/java/test/Ice/background/Configuration.java index 369e0f88d51..3ab582980d3 100644 --- a/java-compat/test/src/main/java/test/Ice/background/Configuration.java +++ b/java-compat/test/src/main/java/test/Ice/background/Configuration.java @@ -58,7 +58,7 @@ public final class Configuration { _initializeException = ex; } - + public synchronized int initializeSocketStatus() { @@ -90,7 +90,7 @@ public final class Configuration { _readException = ex; } - + public synchronized boolean readReady() { @@ -122,7 +122,7 @@ public final class Configuration { _writeException = ex; } - + public synchronized boolean writeReady() { diff --git a/java-compat/test/src/main/java/test/Ice/background/Connector.java b/java-compat/test/src/main/java/test/Ice/background/Connector.java index 0395f4df180..b8c3460079e 100644 --- a/java-compat/test/src/main/java/test/Ice/background/Connector.java +++ b/java-compat/test/src/main/java/test/Ice/background/Connector.java @@ -69,7 +69,7 @@ final class Connector implements IceInternal.Connector } return _connector.equals(p._connector); - } + } final private IceInternal.Connector _connector; final private Configuration _configuration; diff --git a/java-compat/test/src/main/java/test/Ice/binding/Test.ice b/java-compat/test/src/main/java/test/Ice/binding/Test.ice index 49d85cd417c..62664797a4f 100644 --- a/java-compat/test/src/main/java/test/Ice/binding/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/binding/Test.ice @@ -21,7 +21,7 @@ interface TestIntf interface RemoteObjectAdapter { TestIntf* getTestIntf(); - + void deactivate(); }; diff --git a/java-compat/test/src/main/java/test/Ice/checksum/Test.ice b/java-compat/test/src/main/java/test/Ice/checksum/Test.ice index c52fbc3f780..8f0e8a46339 100644 --- a/java-compat/test/src/main/java/test/Ice/checksum/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/checksum/Test.ice @@ -18,7 +18,7 @@ module Test interface Checksum { idempotent Ice::SliceChecksumDict getSliceChecksums(); - + void shutdown(); }; diff --git a/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice b/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice index c470d18c647..7d6cbbf0f9d 100644 --- a/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice +++ b/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice @@ -18,7 +18,7 @@ module Test interface Checksum { idempotent Ice::SliceChecksumDict getSliceChecksums(); - + void shutdown(); }; diff --git a/java-compat/test/src/main/java/test/Ice/dispatcher/Dispatcher.java b/java-compat/test/src/main/java/test/Ice/dispatcher/Dispatcher.java index dacfa1620bb..5f722525810 100644 --- a/java-compat/test/src/main/java/test/Ice/dispatcher/Dispatcher.java +++ b/java-compat/test/src/main/java/test/Ice/dispatcher/Dispatcher.java @@ -27,7 +27,7 @@ public class Dispatcher implements Runnable, Ice.Dispatcher } @Override - public void + public void run() { while(true) @@ -45,7 +45,7 @@ public class Dispatcher implements Runnable, Ice.Dispatcher { } } - + if(!_calls.isEmpty()) { call = _calls.poll(); @@ -56,7 +56,7 @@ public class Dispatcher implements Runnable, Ice.Dispatcher return; } } - + if(call != null) { try @@ -71,7 +71,7 @@ public class Dispatcher implements Runnable, Ice.Dispatcher } } } - + @Override synchronized public void dispatch(Runnable call, Ice.Connection con) @@ -104,7 +104,7 @@ public class Dispatcher implements Runnable, Ice.Dispatcher } } } - + public boolean isDispatcherThread() { diff --git a/java-compat/test/src/main/java/test/Ice/dispatcher/TestControllerI.java b/java-compat/test/src/main/java/test/Ice/dispatcher/TestControllerI.java index 08711e8734e..10fe8967496 100644 --- a/java-compat/test/src/main/java/test/Ice/dispatcher/TestControllerI.java +++ b/java-compat/test/src/main/java/test/Ice/dispatcher/TestControllerI.java @@ -19,14 +19,14 @@ class TestControllerI extends _TestIntfControllerDisp { _adapter.hold(); } - + @Override public void resumeAdapter(Ice.Current current) { _adapter.activate(); } - + public TestControllerI(Ice.ObjectAdapter adapter) { diff --git a/java-compat/test/src/main/java/test/Ice/echo/BlobjectI.java b/java-compat/test/src/main/java/test/Ice/echo/BlobjectI.java index 01ce5cf80f1..e4eded9f3a5 100644 --- a/java-compat/test/src/main/java/test/Ice/echo/BlobjectI.java +++ b/java-compat/test/src/main/java/test/Ice/echo/BlobjectI.java @@ -24,13 +24,13 @@ public class BlobjectI extends Ice.BlobjectAsync { _cb.ice_response(ok, encaps); } - + @Override public void exception(Ice.LocalException ex) { _cb.ice_exception(ex); } - + @Override public void sent(boolean sync) { diff --git a/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java b/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java index a6cb2ac084d..42ed9671a2b 100644 --- a/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java +++ b/java-compat/test/src/main/java/test/Ice/interceptor/MyObjectI.java @@ -22,45 +22,45 @@ class MyObjectI extends _MyObjectDisp { @Override - public int + public int add(int x, int y, Ice.Current current) { return x + y; - } - + } + @Override - public int + public int addWithRetry(int x, int y, Ice.Current current) { String val = current.ctx.get("retry"); - + if(val == null || !val.equals("no")) { throw new RetryException(); } return x + y; - } + } @Override - public int + public int badAdd(int x, int y, Ice.Current current) throws InvalidInputException { throw new InvalidInputException(); - } + } @Override - public int + public int notExistAdd(int x, int y, Ice.Current current) { throw new Ice.ObjectNotExistException(); - } - + } + @Override - public int + public int badSystemAdd(int x, int y, Ice.Current current) { throw new MySystemException(); - } + } // @@ -68,7 +68,7 @@ class MyObjectI extends _MyObjectDisp // @Override - public void + public void amdAdd_async(final AMD_MyObject_amdAdd cb, final int x, final int y, Ice.Current current) { Thread thread = new Thread() @@ -87,13 +87,13 @@ class MyObjectI extends _MyObjectDisp cb.ice_response(x + y); } }; - + thread.setDaemon(true); thread.start(); } @Override - public void + public void amdAddWithRetry_async(final AMD_MyObject_amdAddWithRetry cb, final int x, final int y, Ice.Current current) { Thread thread = new Thread() @@ -112,20 +112,20 @@ class MyObjectI extends _MyObjectDisp cb.ice_response(x + y); } }; - + thread.setDaemon(true); thread.start(); - + String val = current.ctx.get("retry"); - + if(val == null || !val.equals("no")) { throw new RetryException(); } - } - + } + @Override - public void + public void amdBadAdd_async(final AMD_MyObject_amdBadAdd cb, int x, int y, Ice.Current current) { Thread thread = new Thread() @@ -144,13 +144,13 @@ class MyObjectI extends _MyObjectDisp cb.ice_exception(new InvalidInputException()); } }; - + thread.setDaemon(true); thread.start(); - } + } @Override - public void + public void amdNotExistAdd_async(final AMD_MyObject_amdNotExistAdd cb, int x, int y, Ice.Current current) { Thread thread = new Thread() @@ -169,13 +169,13 @@ class MyObjectI extends _MyObjectDisp cb.ice_exception(new Ice.ObjectNotExistException()); } }; - + thread.setDaemon(true); thread.start(); - } - + } + @Override - public void + public void amdBadSystemAdd_async(final AMD_MyObject_amdBadSystemAdd cb, int x, int y, Ice.Current current) { Thread thread = new Thread() @@ -194,8 +194,8 @@ class MyObjectI extends _MyObjectDisp cb.ice_exception(new MySystemException()); } }; - + thread.setDaemon(true); thread.start(); - } + } } diff --git a/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice b/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice index b4678115858..6576ff79c5d 100644 --- a/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/interceptor/Test.ice @@ -67,12 +67,12 @@ interface MyObject // Raise user exception // ["amd"] int amdBadAdd(int x, int y) throws InvalidInputException; - + // // Raise ONE // ["amd"] int amdNotExistAdd(int x, int y); - + // // Raise system exception // diff --git a/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java b/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java index ccdfed5dc8b..71256ba3149 100644 --- a/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java +++ b/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java @@ -19,8 +19,8 @@ class TestControllerI extends test.Ice.interrupt.Test._TestIntfControllerDisp { _threads.add(Thread.currentThread()); } - - synchronized void + + synchronized void removeUpcallThread() { _threads.remove(Thread.currentThread()); @@ -29,7 +29,7 @@ class TestControllerI extends test.Ice.interrupt.Test._TestIntfControllerDisp // Thread.interrupted(); } - + @Override synchronized public void interrupt(Ice.Current current) @@ -51,7 +51,7 @@ class TestControllerI extends test.Ice.interrupt.Test._TestIntfControllerDisp { _adapter.hold(); } - + @Override public void resumeAdapter(Ice.Current current) diff --git a/java-compat/test/src/main/java/test/Ice/location/ServerLocator.java b/java-compat/test/src/main/java/test/Ice/location/ServerLocator.java index 991772d49e1..76d264dde3b 100644 --- a/java-compat/test/src/main/java/test/Ice/location/ServerLocator.java +++ b/java-compat/test/src/main/java/test/Ice/location/ServerLocator.java @@ -63,7 +63,7 @@ public class ServerLocator extends _TestLocatorDisp } response.ice_response(_registry.getObject(id)); } - + @Override public Ice.LocatorRegistryPrx getRegistry(Ice.Current current) @@ -77,7 +77,7 @@ public class ServerLocator extends _TestLocatorDisp { return _requestCount; } - + private ServerLocatorRegistry _registry; private Ice.LocatorRegistryPrx _registryPrx; private int _requestCount; diff --git a/java-compat/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java b/java-compat/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java index 6cee64e3803..739aa289499 100644 --- a/java-compat/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java +++ b/java-compat/test/src/main/java/test/Ice/location/ServerLocatorRegistry.java @@ -31,7 +31,7 @@ public class ServerLocatorRegistry extends _TestLocatorRegistryDisp @Override public void - setReplicatedAdapterDirectProxy_async(Ice.AMD_LocatorRegistry_setReplicatedAdapterDirectProxy cb, String adapter, + setReplicatedAdapterDirectProxy_async(Ice.AMD_LocatorRegistry_setReplicatedAdapterDirectProxy cb, String adapter, String replica, Ice.ObjectPrx object, Ice.Current current) { if(object != null) @@ -80,7 +80,7 @@ public class ServerLocatorRegistry extends _TestLocatorRegistryDisp Ice.ObjectPrx obj = _objects.get(id); if(obj == null) { - throw new Ice.ObjectNotFoundException(); + throw new Ice.ObjectNotFoundException(); } return obj; } diff --git a/java-compat/test/src/main/java/test/Ice/location/Test.ice b/java-compat/test/src/main/java/test/Ice/location/Test.ice index 01b16d81c60..093d4497bf7 100644 --- a/java-compat/test/src/main/java/test/Ice/location/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/location/Test.ice @@ -30,7 +30,7 @@ interface TestLocator extends ::Ice::Locator // idempotent int getRequestCount(); }; - + interface ServerManager { void startServer(); diff --git a/java-compat/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java b/java-compat/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java index 685fa148994..a28351de6d6 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java +++ b/java-compat/test/src/main/java/test/Ice/metrics/ChildInvocationObserverI.java @@ -12,7 +12,7 @@ package test.Ice.metrics; class ChildInvocationObserverI extends ObserverI implements Ice.Instrumentation.ChildInvocationObserver { @Override - public synchronized void + public synchronized void reset() { super.reset(); diff --git a/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java b/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java index ab9cb925516..695ffdce88f 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java +++ b/java-compat/test/src/main/java/test/Ice/metrics/CommunicatorObserverI.java @@ -21,14 +21,14 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver } @Override - public void + public void setObserverUpdater(Ice.Instrumentation.ObserverUpdater u) { updater = u; } - + @Override - synchronized public Ice.Instrumentation.Observer + synchronized public Ice.Instrumentation.Observer getConnectionEstablishmentObserver(Ice.Endpoint e, String s) { if(connectionEstablishmentObserver == null) @@ -39,9 +39,9 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver return connectionEstablishmentObserver; } - + @Override - synchronized public Ice.Instrumentation.Observer + synchronized public Ice.Instrumentation.Observer getEndpointLookupObserver(Ice.Endpoint e) { if(endpointLookupObserver == null) @@ -51,12 +51,12 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver } return endpointLookupObserver; } - + @Override - synchronized public Ice.Instrumentation.ConnectionObserver + synchronized public Ice.Instrumentation.ConnectionObserver getConnectionObserver(Ice.ConnectionInfo c, Ice.Endpoint e, - Ice.Instrumentation.ConnectionState s, + Ice.Instrumentation.ConnectionState s, Ice.Instrumentation.ConnectionObserver old) { test(old == null || old instanceof ConnectionObserverI); @@ -69,7 +69,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver } @Override - synchronized public Ice.Instrumentation.ThreadObserver + synchronized public Ice.Instrumentation.ThreadObserver getThreadObserver(String p, String id, Ice.Instrumentation.ThreadState s, Ice.Instrumentation.ThreadObserver old) { @@ -79,7 +79,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver threadObserver = new ThreadObserverI(); threadObserver.reset(); } - return threadObserver; + return threadObserver; } @Override @@ -134,7 +134,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver dispatchObserver.reset(); } } - + Ice.Instrumentation.ObserverUpdater updater; ObserverI connectionEstablishmentObserver; diff --git a/java-compat/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java b/java-compat/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java index 80fd0810b6a..ace695480b3 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java +++ b/java-compat/test/src/main/java/test/Ice/metrics/ConnectionObserverI.java @@ -12,7 +12,7 @@ package test.Ice.metrics; class ConnectionObserverI extends ObserverI implements Ice.Instrumentation.ConnectionObserver { @Override - public synchronized void + public synchronized void reset() { super.reset(); @@ -21,19 +21,19 @@ class ConnectionObserverI extends ObserverI implements Ice.Instrumentation.Conne } @Override - public synchronized void + public synchronized void sentBytes(int s) { sent += s; } @Override - public synchronized void + public synchronized void receivedBytes(int s) { received += s; } - + int sent; int received; }; diff --git a/java-compat/test/src/main/java/test/Ice/metrics/DispatchObserverI.java b/java-compat/test/src/main/java/test/Ice/metrics/DispatchObserverI.java index 597b971ff44..93f633a618c 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/DispatchObserverI.java +++ b/java-compat/test/src/main/java/test/Ice/metrics/DispatchObserverI.java @@ -12,7 +12,7 @@ package test.Ice.metrics; class DispatchObserverI extends ObserverI implements Ice.Instrumentation.DispatchObserver { @Override - public synchronized void + public synchronized void reset() { super.reset(); @@ -21,14 +21,14 @@ class DispatchObserverI extends ObserverI implements Ice.Instrumentation.Dispatc } @Override - public synchronized void + public synchronized void userException() { ++userExceptionCount; } @Override - public synchronized void + public synchronized void reply(int s) { replySize += s; diff --git a/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java b/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java index f9d91c62e29..e51c3c24c5d 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java +++ b/java-compat/test/src/main/java/test/Ice/metrics/InvocationObserverI.java @@ -12,7 +12,7 @@ package test.Ice.metrics; class InvocationObserverI extends ObserverI implements Ice.Instrumentation.InvocationObserver { @Override - public synchronized void + public synchronized void reset() { super.reset(); @@ -29,21 +29,21 @@ class InvocationObserverI extends ObserverI implements Ice.Instrumentation.Invoc } @Override - public synchronized void + public synchronized void retried() { ++retriedCount; } @Override - public synchronized void + public synchronized void userException() { ++userExceptionCount; } @Override - public synchronized Ice.Instrumentation.RemoteObserver + public synchronized Ice.Instrumentation.RemoteObserver getRemoteObserver(Ice.ConnectionInfo c, Ice.Endpoint e, int a, int b) { if(remoteObserver == null) @@ -56,7 +56,7 @@ class InvocationObserverI extends ObserverI implements Ice.Instrumentation.Invoc @Override - public synchronized Ice.Instrumentation.CollocatedObserver + public synchronized Ice.Instrumentation.CollocatedObserver getCollocatedObserver(Ice.ObjectAdapter adapter, int a, int b) { if(collocatedObserver == null) diff --git a/java-compat/test/src/main/java/test/Ice/metrics/ObserverI.java b/java-compat/test/src/main/java/test/Ice/metrics/ObserverI.java index 179d51272b6..5775a72ca67 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/ObserverI.java +++ b/java-compat/test/src/main/java/test/Ice/metrics/ObserverI.java @@ -11,7 +11,7 @@ package test.Ice.metrics; class ObserverI implements Ice.Instrumentation.Observer { - synchronized public void + synchronized public void reset() { total = 0; @@ -20,38 +20,38 @@ class ObserverI implements Ice.Instrumentation.Observer } @Override - synchronized public void + synchronized public void attach() { ++total; ++current; } @Override - synchronized public void + synchronized public void detach() { --current; } @Override - synchronized public void + synchronized public void failed(String s) { ++failedCount; } - - synchronized int + + synchronized int getTotal() { return total; } - synchronized int + synchronized int getCurrent() { return current; } - synchronized int + synchronized int getFailedCount() { return failedCount; diff --git a/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice index 0b29ffc4ffe..c5bf0d40d55 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/metrics/TestAMD.ice @@ -24,7 +24,7 @@ interface Metrics ["amd"] void op(); ["amd"] idempotent void fail(); - + ["amd"] void opWithUserException() throws UserEx; diff --git a/java-compat/test/src/main/java/test/Ice/metrics/ThreadObserverI.java b/java-compat/test/src/main/java/test/Ice/metrics/ThreadObserverI.java index a358c48be60..351a06144f8 100644 --- a/java-compat/test/src/main/java/test/Ice/metrics/ThreadObserverI.java +++ b/java-compat/test/src/main/java/test/Ice/metrics/ThreadObserverI.java @@ -12,7 +12,7 @@ package test.Ice.metrics; class ThreadObserverI extends ObserverI implements Ice.Instrumentation.ThreadObserver { @Override - public synchronized void + public synchronized void reset() { super.reset(); @@ -20,7 +20,7 @@ class ThreadObserverI extends ObserverI implements Ice.Instrumentation.ThreadObs } @Override - public synchronized void + public synchronized void stateChanged(Ice.Instrumentation.ThreadState o, Ice.Instrumentation.ThreadState n) { ++states; diff --git a/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java b/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java index f20a954110b..c8e76fbb773 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java +++ b/java-compat/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java @@ -795,79 +795,79 @@ public final class AMDMyDerivedClassI extends _MyDerivedClassDisp { cb.ice_response(); } - + @Override public void opByte1_async(AMD_MyClass_opByte1 cb, byte value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opShort1_async(AMD_MyClass_opShort1 cb, short value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opInt1_async(AMD_MyClass_opInt1 cb, int value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opLong1_async(AMD_MyClass_opLong1 cb, long value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opFloat1_async(AMD_MyClass_opFloat1 cb, float value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opDouble1_async(AMD_MyClass_opDouble1 cb, double value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opString1_async(AMD_MyClass_opString1 cb, String value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opStringS1_async(AMD_MyClass_opStringS1 cb, String[] value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opByteBoolD1_async(AMD_MyClass_opByteBoolD1 cb, Map<Byte, Boolean> value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opStringS2_async(AMD_MyClass_opStringS2 cb, String[] value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opByteBoolD2_async(AMD_MyClass_opByteBoolD2 cb, Map<Byte, Boolean> value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opMyClass1_async(AMD_MyDerivedClass_opMyClass1 cb, MyClass1 value, Ice.Current current) { cb.ice_response(value); } - + @Override public void opMyStruct1_async(AMD_MyDerivedClass_opMyStruct1 cb, MyStruct1 value, Ice.Current current) { @@ -890,7 +890,7 @@ public final class AMDMyDerivedClassI extends _MyDerivedClassDisp s8.value, s9.value, s10.value, - + sw0.value, sw1.value, sw2.value, @@ -902,20 +902,20 @@ public final class AMDMyDerivedClassI extends _MyDerivedClassDisp sw8.value, sw9.value, sw10.value, - + ss0.value, ss1.value, ss2.value, ss3.value, ss4.value, ss5.value, - + su0.value, su1.value, su2.value }); } - + @Override public void opWStringLiterals_async(AMD_MyClass_opWStringLiterals cb, Ice.Current current) { @@ -932,7 +932,7 @@ public final class AMDMyDerivedClassI extends _MyDerivedClassDisp s8.value, s9.value, s10.value, - + sw0.value, sw1.value, sw2.value, @@ -944,14 +944,14 @@ public final class AMDMyDerivedClassI extends _MyDerivedClassDisp sw8.value, sw9.value, sw10.value, - + ss0.value, ss1.value, ss2.value, ss3.value, ss4.value, ss5.value, - + su0.value, su1.value, su2.value diff --git a/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java b/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java index 085504fa443..412b413de31 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java +++ b/java-compat/test/src/main/java/test/Ice/operations/MyDerivedClassI.java @@ -741,85 +741,85 @@ public final class MyDerivedClassI extends _MyDerivedClassDisp opDerived(Ice.Current current) { } - + @Override public byte opByte1(byte value, Ice.Current current) { return value; } - + @Override public short opShort1(short value, Ice.Current current) { return value; } - + @Override public int opInt1(int value, Ice.Current current) { return value; } - + @Override public long opLong1(long value, Ice.Current current) { return value; } - + @Override public float opFloat1(float value, Ice.Current current) { return value; } - + @Override public double opDouble1(double value, Ice.Current current) { return value; } - + @Override public String opString1(String value, Ice.Current current) { return value; } - + @Override public String[] opStringS1(String[] value, Ice.Current current) { return value; } - + @Override public Map<Byte, Boolean> opByteBoolD1(Map<Byte, Boolean> value, Ice.Current current) { return value; } - + @Override public String[] opStringS2(String[] value, Ice.Current current) { return value; } - + @Override public Map<Byte, Boolean> opByteBoolD2(Map<Byte, Boolean> value, Ice.Current current) { return value; } - + @Override public MyClass1 opMyClass1(MyClass1 value, Ice.Current current) { return value; } - + @Override public MyStruct1 opMyStruct1(MyStruct1 value, Ice.Current current) { return value; } - + @Override public String[] opStringLiterals(Ice.Current current) { @@ -836,7 +836,7 @@ public final class MyDerivedClassI extends _MyDerivedClassDisp s8.value, s9.value, s10.value, - + sw0.value, sw1.value, sw2.value, @@ -848,14 +848,14 @@ public final class MyDerivedClassI extends _MyDerivedClassDisp sw8.value, sw9.value, sw10.value, - + ss0.value, ss1.value, ss2.value, ss3.value, ss4.value, ss5.value, - + su0.value, su1.value, su2.value diff --git a/java-compat/test/src/main/java/test/Ice/properties/Client.java b/java-compat/test/src/main/java/test/Ice/properties/Client.java index cb23fb38d53..d92699638ba 100644 --- a/java-compat/test/src/main/java/test/Ice/properties/Client.java +++ b/java-compat/test/src/main/java/test/Ice/properties/Client.java @@ -65,7 +65,7 @@ public class Client extends test.Util.Application test(properties.getProperty("Config3").equals("Config3")); System.out.println("ok"); } - + { System.out.print("testing configuration file escapes... "); String[] args1 = new String[]{"--Ice.Config=config/escapes.cfg"}; @@ -93,10 +93,10 @@ public class Client extends test.Util.Application "AServer", "\\\\server\\dir", "BServer", "\\server\\dir", ""}; - + for(int i = 0; !props[i].isEmpty(); i += 2) { - test(properties.getProperty(props[i]).equals(props[i + 1])); + test(properties.getProperty(props[i]).equals(props[i + 1])); } System.out.println("ok"); } diff --git a/java-compat/test/src/main/java/test/Ice/properties/config/escapes.cfg b/java-compat/test/src/main/java/test/Ice/properties/config/escapes.cfg index f438d2b59c8..4c3376d550a 100644 --- a/java-compat/test/src/main/java/test/Ice/properties/config/escapes.cfg +++ b/java-compat/test/src/main/java/test/Ice/properties/config/escapes.cfg @@ -10,7 +10,7 @@ Prop1 = 1 # Key is "Prop1" Prop2 = 2 # Key is "Prop2" \ Prop3 \ = 3 # Key is "Prop3" My Prop1 = 1 # Key is "My Prop1" -My\ Prop2 = 2 # Key is "My Prop2" +My\ Prop2 = 2 # Key is "My Prop2" My.Prop1 = a property # Value is "a property" My.Prop2 = a property # Value is "a property" diff --git a/java-compat/test/src/main/java/test/Ice/retry/AllTests.java b/java-compat/test/src/main/java/test/Ice/retry/AllTests.java index 7d67872fe29..8ffe74a5eef 100644 --- a/java-compat/test/src/main/java/test/Ice/retry/AllTests.java +++ b/java-compat/test/src/main/java/test/Ice/retry/AllTests.java @@ -113,7 +113,7 @@ public class AllTests } public static RetryPrx - allTests(Ice.Communicator communicator, Ice.Communicator communicator2, PrintWriter out, + allTests(Ice.Communicator communicator, Ice.Communicator communicator2, PrintWriter out, Instrumentation instrumentation, String ref) { out.print("testing stringToProxy... "); @@ -159,7 +159,7 @@ public class AllTests instrumentation.testFailureCount(1); instrumentation.testRetryCount(0); out.println("ok"); - + out.print("calling regular operation with first proxy again... "); out.flush(); retry1.op(false); diff --git a/java-compat/test/src/main/java/test/Ice/retry/Instrumentation.java b/java-compat/test/src/main/java/test/Ice/retry/Instrumentation.java index 00f06ae67b2..0b8baf52f95 100644 --- a/java-compat/test/src/main/java/test/Ice/retry/Instrumentation.java +++ b/java-compat/test/src/main/java/test/Ice/retry/Instrumentation.java @@ -23,13 +23,13 @@ public class Instrumentation class InvocationObserverI implements Ice.Instrumentation.InvocationObserver { @Override - public void + public void attach() { } - + @Override - public void + public void detach() { synchronized(Instrumentation.class) @@ -39,7 +39,7 @@ public class Instrumentation } @Override - public void + public void failed(String msg) { synchronized(Instrumentation.class) @@ -49,7 +49,7 @@ public class Instrumentation } @Override - public void + public void retried() { synchronized(Instrumentation.class) @@ -59,11 +59,11 @@ public class Instrumentation } @Override - public void + public void userException() { } - + @Override public Ice.Instrumentation.RemoteObserver getRemoteObserver(Ice.ConnectionInfo ci, Ice.Endpoint ei, int i, int j) @@ -72,7 +72,7 @@ public class Instrumentation } @Override - public Ice.Instrumentation.CollocatedObserver + public Ice.Instrumentation.CollocatedObserver getCollocatedObserver(Ice.ObjectAdapter adapter, int i , int j) { return null; @@ -84,60 +84,60 @@ public class Instrumentation class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver { @Override - public Ice.Instrumentation.Observer + public Ice.Instrumentation.Observer getConnectionEstablishmentObserver(Ice.Endpoint e, String s) { return null; } @Override - public Ice.Instrumentation.Observer + public Ice.Instrumentation.Observer getEndpointLookupObserver(Ice.Endpoint e) { return null; } @Override - public Ice.Instrumentation.ConnectionObserver - getConnectionObserver(Ice.ConnectionInfo ci, - Ice.Endpoint ei, + public Ice.Instrumentation.ConnectionObserver + getConnectionObserver(Ice.ConnectionInfo ci, + Ice.Endpoint ei, Ice.Instrumentation.ConnectionState s, Ice.Instrumentation.ConnectionObserver o) { return null; } - + @Override - public Ice.Instrumentation.ThreadObserver - getThreadObserver(String p, - String n, - Ice.Instrumentation.ThreadState s, + public Ice.Instrumentation.ThreadObserver + getThreadObserver(String p, + String n, + Ice.Instrumentation.ThreadState s, Ice.Instrumentation.ThreadObserver o) { return null; } @Override - public Ice.Instrumentation.InvocationObserver + public Ice.Instrumentation.InvocationObserver getInvocationObserver(Ice.ObjectPrx p, String o, java.util.Map<String, String> c) { return invocationObserver; } - + @Override - public Ice.Instrumentation.DispatchObserver + public Ice.Instrumentation.DispatchObserver getDispatchObserver(Ice.Current c, int i) { return null; } - + @Override - public void + public void setObserverUpdater(Ice.Instrumentation.ObserverUpdater u) { } }; - + private Ice.Instrumentation.CommunicatorObserver communicatorObserver = new CommunicatorObserverI(); public Ice.Instrumentation.CommunicatorObserver @@ -180,7 +180,7 @@ public class Instrumentation } value.value = 0; } - + public void testRetryCount(int expected) { diff --git a/java-compat/test/src/main/java/test/Ice/retry/RetryI.java b/java-compat/test/src/main/java/test/Ice/retry/RetryI.java index 082cd34e23a..117ce3ec4c6 100644 --- a/java-compat/test/src/main/java/test/Ice/retry/RetryI.java +++ b/java-compat/test/src/main/java/test/Ice/retry/RetryI.java @@ -54,21 +54,21 @@ public final class RetryI extends _RetryDisp _counter = 0; return counter; } - + @Override public void opNotIdempotent(Ice.Current current) { throw new Ice.ConnectionLostException(); } - + @Override public void opSystemException(Ice.Current c) { throw new SystemFailure(); } - + @Override public void shutdown(Ice.Current current) diff --git a/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java b/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java index 811c6f05ec3..2bc3a45c097 100644 --- a/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java +++ b/java-compat/test/src/main/java/test/Ice/servantLocator/AMDServantLocatorI.java @@ -55,7 +55,7 @@ public final class AMDServantLocatorI implements Ice.ServantLocator } test(current.id.category.equals(_category) || _category.length() == 0); - + if(current.id.name.equals("unknown")) { return null; @@ -95,12 +95,12 @@ public final class AMDServantLocatorI implements Ice.ServantLocator test(current.id.category.equals(_category) || _category.length() == 0); test(current.id.name.equals("locate") || current.id.name.equals("finished")); - + if(current.id.name.equals("finished")) { exception(current); } - + Cookie co = (Cookie)cookie; test(co.message().equals("blahblah")); } @@ -143,7 +143,7 @@ public final class AMDServantLocatorI implements Ice.ServantLocator // // User exceptions are checked exceptions in Java, so it's not // possible to throw it from the servant locator. - // + // // else if(current.operation.equals("userException")) // { // throw new TestIntfUserException(); diff --git a/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestI.java b/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestI.java index 6233af27467..bd6457b71e3 100644 --- a/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestI.java +++ b/java-compat/test/src/main/java/test/Ice/servantLocator/AMDTestI.java @@ -28,56 +28,56 @@ import test.Ice.servantLocator.AMD.Test._TestIntfDisp; public final class AMDTestI extends _TestIntfDisp { @Override - public void + public void requestFailedException_async(AMD_TestIntf_requestFailedException cb, Ice.Current current) { cb.ice_response(); } @Override - public void + public void unknownUserException_async(AMD_TestIntf_unknownUserException cb, Ice.Current current) { cb.ice_response(); } @Override - public void + public void unknownLocalException_async(AMD_TestIntf_unknownLocalException cb, Ice.Current current) { cb.ice_response(); } @Override - public void + public void unknownException_async(AMD_TestIntf_unknownException cb, Ice.Current current) { cb.ice_response(); } @Override - public void + public void localException_async(AMD_TestIntf_localException cb, Ice.Current current) { cb.ice_response(); } -// public void +// public void // userException_async(AMD_TestIntf_userException cb, Ice.Current current) // { // cb.ice_response(); // } @Override - public void + public void javaException_async(AMD_TestIntf_javaException cb, Ice.Current current) { cb.ice_response(); } @Override - public void - unknownExceptionWithServantException_async(AMD_TestIntf_unknownExceptionWithServantException cb, + public void + unknownExceptionWithServantException_async(AMD_TestIntf_unknownExceptionWithServantException cb, Ice.Current current) { cb.ice_exception(new Ice.ObjectNotExistException()); @@ -134,7 +134,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(new TestIntfUserException()); throw new Ice.ObjectNotExistException(); } - + @Override public void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) diff --git a/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java b/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java index 6fb42baa31b..9d0c67223ef 100644 --- a/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java +++ b/java-compat/test/src/main/java/test/Ice/servantLocator/ServantLocatorI.java @@ -55,7 +55,7 @@ public final class ServantLocatorI implements Ice.ServantLocator } test(current.id.category.equals(_category) || _category.length() == 0); - + if(current.id.name.equals("unknown")) { return null; @@ -95,12 +95,12 @@ public final class ServantLocatorI implements Ice.ServantLocator test(current.id.category.equals(_category) || _category.length() == 0); test(current.id.name.equals("locate") || current.id.name.equals("finished")); - + if(current.id.name.equals("finished")) { exception(current); } - + Cookie co = (Cookie)cookie; test(co.message().equals("blahblah")); } @@ -143,7 +143,7 @@ public final class ServantLocatorI implements Ice.ServantLocator // // User exceptions are checked exceptions in Java, so it's not // possible to throw it from the servant locator. - // + // // else if(current.operation.equals("userException")) // { // throw new TestIntfUserException(); diff --git a/java-compat/test/src/main/java/test/Ice/servantLocator/TestI.java b/java-compat/test/src/main/java/test/Ice/servantLocator/TestI.java index 62ee6c66805..76b1842c1d2 100644 --- a/java-compat/test/src/main/java/test/Ice/servantLocator/TestI.java +++ b/java-compat/test/src/main/java/test/Ice/servantLocator/TestI.java @@ -16,48 +16,48 @@ import test.Ice.servantLocator.Test._TestIntfDisp; public final class TestI extends _TestIntfDisp { @Override - public void + public void requestFailedException(Ice.Current current) { } @Override - public void + public void unknownUserException(Ice.Current current) { } @Override - public void + public void unknownLocalException(Ice.Current current) { } @Override - public void + public void unknownException(Ice.Current current) { } @Override - public void + public void localException(Ice.Current current) { } -// public void +// public void // userException(Ice.Current current) // { // } @Override - public void + public void javaException(Ice.Current current) { } @Override - public void + public void unknownExceptionWithServantException(Ice.Current current) { throw new Ice.ObjectNotExistException(); diff --git a/java-compat/test/src/main/java/test/Ice/stream/Test.ice b/java-compat/test/src/main/java/test/Ice/stream/Test.ice index 9e805930aa3..2672c627f64 100644 --- a/java-compat/test/src/main/java/test/Ice/stream/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/stream/Test.ice @@ -60,13 +60,13 @@ class OptionalClass optional(1) short sh; optional(2) int i; optional(3) SmallStruct sm; - + optional(4) MyEnumS enumS4; optional(5) MyClassS myClassS5; - + optional(6) ByteBoolD byteBoolD6; optional(7) ShortIntD shortIntD7; - + optional(8) MyEnum enum8; optional(9) MyClass class9; optional(10) StringMyClassD stringMyClassD10; diff --git a/java-compat/test/src/main/java/test/Ice/throughput/Throughput.ice b/java-compat/test/src/main/java/test/Ice/throughput/Throughput.ice index 27c32d46e22..aaca70ee59f 100644 --- a/java-compat/test/src/main/java/test/Ice/throughput/Throughput.ice +++ b/java-compat/test/src/main/java/test/Ice/throughput/Throughput.ice @@ -42,7 +42,7 @@ interface Throughput bool needsWarmup(); void startWarmup(); void endWarmup(); - + void sendByteSeq(ByteSeq seq); ByteSeq recvByteSeq(); ByteSeq echoByteSeq(ByteSeq seq); diff --git a/java-compat/test/src/main/java/test/IceBox/admin/AllTests.java b/java-compat/test/src/main/java/test/IceBox/admin/AllTests.java index 86c2e7fec6a..8f0c425b361 100644 --- a/java-compat/test/src/main/java/test/IceBox/admin/AllTests.java +++ b/java-compat/test/src/main/java/test/IceBox/admin/AllTests.java @@ -98,7 +98,7 @@ public class AllTests System.out.print("testing metrics admin facet... "); System.out.flush(); { - IceMX.MetricsAdminPrx ma = + IceMX.MetricsAdminPrx ma = IceMX.MetricsAdminPrxHelper.checkedCast(admin, "IceBox.Service.TestService.Metrics"); Ice.PropertiesAdminPrx pa = @@ -118,9 +118,9 @@ public class AllTests views = ma.getMetricsViewNames(disabledViews); test(views.length == 3); - + // Make sure that the IceBox communicator metrics admin is a separate instance. - test(IceMX.MetricsAdminPrxHelper.checkedCast(admin, + test(IceMX.MetricsAdminPrxHelper.checkedCast(admin, "Metrics").getMetricsViewNames(disabledViews).length == 0); } System.out.println("ok"); diff --git a/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice b/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice index f26cc0f1c55..d4a0543ae06 100644 --- a/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice +++ b/java-compat/test/src/main/java/test/IceBox/configuration/Test.ice @@ -19,7 +19,7 @@ interface TestIntf { string getProperty(string name); Ice::StringSeq getArgs(); - + }; }; diff --git a/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java b/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java index 2ac35d7a56a..c969859be45 100644 --- a/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java +++ b/java-compat/test/src/main/java/test/IceBox/configuration/TestI.java @@ -26,13 +26,13 @@ public class TestI extends _TestIntfDisp { return current.adapter.getCommunicator().getProperties().getProperty(name); } - + @Override public String[] getArgs(Ice.Current current) { return _args; } - + final private String[] _args; } diff --git a/java-compat/test/src/main/java/test/IceBox/configuration/TestServiceI.java b/java-compat/test/src/main/java/test/IceBox/configuration/TestServiceI.java index fd69ad52311..7497fac394e 100644 --- a/java-compat/test/src/main/java/test/IceBox/configuration/TestServiceI.java +++ b/java-compat/test/src/main/java/test/IceBox/configuration/TestServiceI.java @@ -16,7 +16,7 @@ public class TestServiceI implements IceBox.Service start(String name, Ice.Communicator communicator, String[] args) { communicator.getProperties().setProperty("Ice.Package.Test", "test.IceBox.configuration"); - + Ice.ObjectAdapter adapter = communicator.createObjectAdapter(name + "OA"); adapter.add(new TestI(args), Ice.Util.stringToIdentity("test")); adapter.activate(); diff --git a/java-compat/test/src/main/java/test/IceDiscovery/simple/Client.java b/java-compat/test/src/main/java/test/IceDiscovery/simple/Client.java index 40562f909c5..6b2fd00c4fa 100644 --- a/java-compat/test/src/main/java/test/IceDiscovery/simple/Client.java +++ b/java-compat/test/src/main/java/test/IceDiscovery/simple/Client.java @@ -15,7 +15,7 @@ public class Client extends test.Util.Application public int run(String[] args) { int num; - try + try { num = args.length == 1 ? Integer.parseInt(args[0]) : 0; } diff --git a/java-compat/test/src/main/java/test/IceDiscovery/simple/ControllerI.java b/java-compat/test/src/main/java/test/IceDiscovery/simple/ControllerI.java index 8c6cc58846d..f3fee552422 100644 --- a/java-compat/test/src/main/java/test/IceDiscovery/simple/ControllerI.java +++ b/java-compat/test/src/main/java/test/IceDiscovery/simple/ControllerI.java @@ -61,6 +61,6 @@ public final class ControllerI extends _ControllerDisp current.adapter.getCommunicator().shutdown(); } - final private java.util.Map<String, Ice.ObjectAdapter> _adapters = + final private java.util.Map<String, Ice.ObjectAdapter> _adapters = new java.util.HashMap<String, Ice.ObjectAdapter>(); } diff --git a/java-compat/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java b/java-compat/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java index 7d4114d51a0..d514dbf169a 100644 --- a/java-compat/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java +++ b/java-compat/test/src/main/java/test/IceDiscovery/simple/TestIntfI.java @@ -14,7 +14,7 @@ import test.IceDiscovery.simple.Test.*; public final class TestIntfI extends _TestIntfDisp { @Override - public String + public String getAdapterId(Ice.Current current) { return current.adapter.getCommunicator().getProperties().getProperty(current.adapter.getName() + ".AdapterId"); diff --git a/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java b/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java index 39d1b92c132..2424e6c970a 100644 --- a/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java +++ b/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java @@ -536,7 +536,7 @@ public class AllTests fact.destroyServer(server); comm.destroy(); } - + // // Target host does not match the certificate DNS altName // @@ -561,7 +561,7 @@ public class AllTests fact.destroyServer(server); comm.destroy(); } - + // // Target host matches the certificate Common Name and the certificate does not // include a DNS altName @@ -586,7 +586,7 @@ public class AllTests fact.destroyServer(server); comm.destroy(); } - + // // Target host does not match the certificate Common Name and the certificate does not // include a DNS altName @@ -612,7 +612,7 @@ public class AllTests fact.destroyServer(server); comm.destroy(); } - + // // Target host matches the certificate Common Name and the certificate has // a DNS altName that does not matches the target host @@ -638,11 +638,11 @@ public class AllTests fact.destroyServer(server); comm.destroy(); } - + // // Test using 127.0.0.1 as target host // - + // // Target host matches the certificate IP altName // @@ -666,7 +666,7 @@ public class AllTests fact.destroyServer(server); comm.destroy(); } - + // // Target host does not match the certificate IP altName // @@ -691,7 +691,7 @@ public class AllTests fact.destroyServer(server); comm.destroy(); } - + // // Target host is an IP addres that matches the CN and the certificate doesn't // include an IP altName diff --git a/java-compat/test/src/main/java/test/IceUtil/inputUtil/Client.java b/java-compat/test/src/main/java/test/IceUtil/inputUtil/Client.java index 8ee4efc0536..1f30709573e 100644 --- a/java-compat/test/src/main/java/test/IceUtil/inputUtil/Client.java +++ b/java-compat/test/src/main/java/test/IceUtil/inputUtil/Client.java @@ -30,7 +30,7 @@ public class Client try { test(IceUtilInternal.Options.split("").length == 0); - + args = IceUtilInternal.Options.split("\"\""); test(args.length == 1 && args[0].equals("")); args = IceUtilInternal.Options.split("''"); @@ -130,7 +130,7 @@ public class Client test(arr.length == 2 && arr[0].equals("a") && arr[1].equals("b")); arr = IceUtilInternal.StringUtil.splitString(":a:b:", ":"); test(arr.length == 2 && arr[0].equals("a") && arr[1].equals("b")); - + arr = IceUtilInternal.StringUtil.splitString("\"a\"", ":"); test(arr.length == 1 && arr[0].equals("a")); arr = IceUtilInternal.StringUtil.splitString("\"a\":b", ":"); @@ -148,7 +148,7 @@ public class Client test(arr.length == 1 && arr[0].equals("\"a")); arr = IceUtilInternal.StringUtil.splitString("\"'a\"", ":"); test(arr.length == 1 && arr[0].equals("'a")); - + arr = IceUtilInternal.StringUtil.splitString("a\\'b", ":"); test(arr.length == 1 && arr[0].equals("a'b")); arr = IceUtilInternal.StringUtil.splitString("'a:b\\'c'", ":"); diff --git a/java-compat/test/src/main/java/test/Slice/escape/Clash.ice b/java-compat/test/src/main/java/test/Slice/escape/Clash.ice index 448e1c73e94..01b6dd0d9f9 100644 --- a/java-compat/test/src/main/java/test/Slice/escape/Clash.ice +++ b/java-compat/test/src/main/java/test/Slice/escape/Clash.ice @@ -26,9 +26,9 @@ interface Intf void istr(); void obj(); - void op(string context, string current, string response, string ex, string sent, string cookie, + void op(string context, string current, string response, string ex, string sent, string cookie, string sync, string result, string istr, string ostr, optional(1) string proxy, optional(2) int obj); - void opOut(out string context, out string current, out string response, out string ex, + void opOut(out string context, out string current, out string response, out string ex, out string sent, out string cookie, out string sync, out string result, out string istr, out string ostr, out optional(1) string proxy, out optional(2) int obj); }; |