diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-07-27 19:30:37 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-07-27 19:30:37 -0400 |
| commit | 883edab4361e58957796f25d5fc55cfb41f0f6ea (patch) | |
| tree | fc90adc372b66bf0becf4c0912794c64af250a29 /java | |
| parent | ICE-7242 - Cross test updates (diff) | |
| download | ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.tar.bz2 ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.tar.xz ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.zip | |
Deprecate Communicator::stringToIdentity and identityToString
Diffstat (limited to 'java')
114 files changed, 203 insertions, 213 deletions
diff --git a/java/src/Ice/src/main/java/Ice/CommunicatorI.java b/java/src/Ice/src/main/java/Ice/CommunicatorI.java index 371a3a39aaf..1713b0dc05e 100644 --- a/java/src/Ice/src/main/java/Ice/CommunicatorI.java +++ b/java/src/Ice/src/main/java/Ice/CommunicatorI.java @@ -71,14 +71,14 @@ public final class CommunicatorI implements Communicator public Ice.Identity stringToIdentity(String s) { - return _instance.stringToIdentity(s); + return Ice.Util.stringToIdentity(s); } @Override public String identityToString(Ice.Identity ident) { - return _instance.identityToString(ident); + return Ice.Util.identityToString(ident); } @Override diff --git a/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java b/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java index f645c6c5ccd..1aeef2206fa 100644 --- a/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java +++ b/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java @@ -980,7 +980,7 @@ public final class ObjectAdapterI implements ObjectAdapter if(_routerInfo.getAdapter() != null) { throw new AlreadyRegisteredException("object adapter with router", - _instance.identityToString(router.ice_getIdentity())); + Ice.Util.identityToString(router.ice_getIdentity())); } // diff --git a/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java b/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java index 5b9f377d807..095948736e3 100644 --- a/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java @@ -319,7 +319,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb public String getIdentity() { - return _current.adapter.getCommunicator().identityToString(_current.id); + return Ice.Util.identityToString(_current.id); } final private Ice.Current _current; @@ -428,7 +428,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb catch(Exception ex) { // Either a fixed proxy or the communicator is destroyed. - os.append(_proxy.ice_getCommunicator().identityToString(_proxy.ice_getIdentity())); + os.append(Ice.Util.identityToString(_proxy.ice_getIdentity())); os.append(" [").append(_operation).append(']'); } _id = os.toString(); @@ -458,7 +458,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb { if(_proxy != null) { - return _proxy.ice_getCommunicator().identityToString(_proxy.ice_getIdentity()); + return Ice.Util.identityToString(_proxy.ice_getIdentity()); } else { diff --git a/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java b/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java index c57bc1ad407..ebbf963aba9 100644 --- a/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java @@ -59,4 +59,4 @@ public class ConnectionObserverI private int _sentBytes; private int _receivedBytes; -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceInternal/IncomingBase.java b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java index 151343941af..93c853c9853 100644 --- a/java/src/Ice/src/main/java/IceInternal/IncomingBase.java +++ b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java @@ -235,7 +235,7 @@ class IncomingBase IceUtilInternal.OutputBase out = new IceUtilInternal.OutputBase(pw); out.setUseTab(false); out.print("dispatch exception:"); - out.print("\nidentity: " + _instance.identityToString(_current.id)); + out.print("\nidentity: " + Ice.Util.identityToString(_current.id)); out.print("\nfacet: " + IceUtilInternal.StringUtil.escapeString(_current.facet, "")); out.print("\noperation: " + _current.operation); if(_current.con != null) diff --git a/java/src/Ice/src/main/java/IceInternal/Instance.java b/java/src/Ice/src/main/java/IceInternal/Instance.java index 1f019001136..1543bc1ebf1 100644 --- a/java/src/Ice/src/main/java/IceInternal/Instance.java +++ b/java/src/Ice/src/main/java/IceInternal/Instance.java @@ -420,18 +420,6 @@ public final class Instance implements Ice.ClassResolver return _implicitContext; } - public Ice.Identity - stringToIdentity(String s) - { - return Ice.Util.stringToIdentity(s); - } - - public String - identityToString(Ice.Identity ident) - { - return Ice.Util.identityToString(ident); - } - public synchronized Ice.ObjectPrx createAdmin(Ice.ObjectAdapter adminAdapter, Ice.Identity adminIdentity) { diff --git a/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java b/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java index 87afdb394b7..82c4dea0e25 100644 --- a/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java +++ b/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java @@ -466,7 +466,7 @@ public final class LocatorInfo else { s.append("object = "); - s.append(ref.getInstance().identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); s.append("\n"); } @@ -518,13 +518,13 @@ public final class LocatorInfo StringBuilder s = new StringBuilder(128); s.append("object not found\n"); s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString()); } Ice.NotRegisteredException e = new Ice.NotRegisteredException(); e.kindOfObject = "object"; - e.id = instance.identityToString(ref.getIdentity()); + e.id = Ice.Util.identityToString(ref.getIdentity()); throw e; } catch(Ice.NotRegisteredException ex) @@ -547,7 +547,7 @@ public final class LocatorInfo else { s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); s.append("\n"); } s.append("reason = " + ex); @@ -591,7 +591,7 @@ public final class LocatorInfo { s.append("object\n"); s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); s.append("\n"); } instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString()); @@ -630,7 +630,7 @@ public final class LocatorInfo StringBuilder s = new StringBuilder(128); s.append("searching for object by id\n"); s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString()); } diff --git a/java/src/Ice/src/main/java/IceInternal/Reference.java b/java/src/Ice/src/main/java/IceInternal/Reference.java index e765cec180c..b7ea1dd2f32 100644 --- a/java/src/Ice/src/main/java/IceInternal/Reference.java +++ b/java/src/Ice/src/main/java/IceInternal/Reference.java @@ -311,7 +311,7 @@ public abstract class Reference implements Cloneable // the reference parser uses as separators, then we enclose // the identity string in quotes. // - String id = _instance.identityToString(_identity); + String id = Ice.Util.identityToString(_identity); if(IceUtilInternal.StringUtil.findFirstOf(id, " :@") != -1) { s.append('"'); diff --git a/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java b/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java index 874f977c471..ed36537017e 100644 --- a/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java @@ -127,7 +127,7 @@ public final class ReferenceFactory // // Parsing the identity may raise IdentityParseException. // - Ice.Identity ident = _instance.stringToIdentity(idstr); + Ice.Identity ident = Ice.Util.stringToIdentity(idstr); if(ident.name.length() == 0) { diff --git a/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java b/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java index 12af3e0b1c4..f7c35f706eb 100644 --- a/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java @@ -31,4 +31,4 @@ public class RemoteObserverI _delegate.reply(size); } } -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceInternal/ServantManager.java b/java/src/Ice/src/main/java/IceInternal/ServantManager.java index 4382a3044eb..2789304f276 100644 --- a/java/src/Ice/src/main/java/IceInternal/ServantManager.java +++ b/java/src/Ice/src/main/java/IceInternal/ServantManager.java @@ -32,7 +32,7 @@ public final class ServantManager if(m.containsKey(facet)) { Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); - ex.id = _instance.identityToString(ident); + ex.id = Ice.Util.identityToString(ident); ex.kindOfObject = "servant"; if(facet.length() > 0) { @@ -77,7 +77,7 @@ public final class ServantManager if(m == null || (obj = m.remove(facet)) == null) { Ice.NotRegisteredException ex = new Ice.NotRegisteredException(); - ex.id = _instance.identityToString(ident); + ex.id = Ice.Util.identityToString(ident); ex.kindOfObject = "servant"; if(facet.length() > 0) { @@ -120,7 +120,7 @@ public final class ServantManager if(m == null) { Ice.NotRegisteredException ex = new Ice.NotRegisteredException(); - ex.id = _instance.identityToString(ident); + ex.id = Ice.Util.identityToString(ident); ex.kindOfObject = "servant"; throw ex; } diff --git a/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java b/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java index 2dc06f8b1c2..553e46840bf 100644 --- a/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java @@ -65,4 +65,4 @@ public class ThreadObserverI private Ice.Instrumentation.ThreadState _oldState; private Ice.Instrumentation.ThreadState _newState; -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceInternal/TraceUtil.java b/java/src/Ice/src/main/java/IceInternal/TraceUtil.java index ec6d9ff910c..2ff165c475d 100644 --- a/java/src/Ice/src/main/java/IceInternal/TraceUtil.java +++ b/java/src/Ice/src/main/java/IceInternal/TraceUtil.java @@ -168,7 +168,7 @@ public final class TraceUtil { Ice.Identity identity = new Ice.Identity(); identity.__read(stream); - out.write("\nidentity = " + stream.instance().identityToString(identity)); + out.write("\nidentity = " + Ice.Util.identityToString(identity)); String[] facet = stream.readStringSeq(); out.write("\nfacet = "); diff --git a/java/src/Ice/src/main/java/IceMX/MetricsHelper.java b/java/src/Ice/src/main/java/IceMX/MetricsHelper.java index 8d5aac39062..84dfc57d19f 100644 --- a/java/src/Ice/src/main/java/IceMX/MetricsHelper.java +++ b/java/src/Ice/src/main/java/IceMX/MetricsHelper.java @@ -185,4 +185,4 @@ public class MetricsHelper<T> } private AttributeResolver _attributes; -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceMX/ObserverFactory.java b/java/src/Ice/src/main/java/IceMX/ObserverFactory.java index a629ee38b7e..ca06b0a8c00 100644 --- a/java/src/Ice/src/main/java/IceMX/ObserverFactory.java +++ b/java/src/Ice/src/main/java/IceMX/ObserverFactory.java @@ -139,4 +139,4 @@ public class ObserverFactory<T extends Metrics, O extends Observer<T>> private java.util.List<MetricsMap<T>> _maps = new java.util.ArrayList<MetricsMap<T>>(); private volatile boolean _enabled; private Runnable _updater; -}
\ No newline at end of file +} diff --git a/java/src/IceBox/src/main/java/IceBox/Admin.java b/java/src/IceBox/src/main/java/IceBox/Admin.java index 0b363f83c6a..52e39ee771e 100644 --- a/java/src/IceBox/src/main/java/IceBox/Admin.java +++ b/java/src/IceBox/src/main/java/IceBox/Admin.java @@ -84,7 +84,7 @@ public final class Admin return 1; } - managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" :" + managerEndpoints; + managerProxy = "\"" + Ice.Util.identityToString(managerIdentity) + "\" :" + managerEndpoints; } else { @@ -95,7 +95,7 @@ public final class Admin return 1; } - managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" @" + managerAdapterId; + managerProxy = "\"" + Ice.Util.identityToString(managerIdentity) + "\" @" + managerAdapterId; } base = communicator().stringToProxy(managerProxy); diff --git a/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java index 3b586d4ccf7..4f45834c7ea 100644 --- a/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java +++ b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java @@ -106,7 +106,7 @@ public class PluginI implements Ice.Plugin // Add lookup and lookup reply Ice objects // LookupI lookup = new LookupI(locatorRegistry, LookupPrxHelper.uncheckedCast(lookupPrx), properties); - _multicastAdapter.add(lookup, _communicator.stringToIdentity("IceDiscovery/Lookup")); + _multicastAdapter.add(lookup, Ice.Util.stringToIdentity("IceDiscovery/Lookup")); Ice.ObjectPrx lookupReply = _replyAdapter.addWithUUID(new LookupReplyI(lookup)).ice_datagram(); lookup.setLookupReply(LookupReplyPrxHelper.uncheckedCast(lookupReply)); diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java index 30d5e204a2d..a06e8617f97 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java @@ -2079,7 +2079,7 @@ public class Coordinator cb.setRegistry(RegistryPrxHelper. uncheckedCast(_communicator.stringToProxy( - "\"" + _communicator.identityToString(masterRegistryId) + "\""))); + "\"" + Ice.Util.identityToString(masterRegistryId) + "\""))); } // diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java index 0c63f23da50..4c21bee85bd 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java @@ -75,4 +75,4 @@ public class Fallback extends javax.swing.JApplet System.exit(1); } } -}
\ No newline at end of file +} diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java index ed358694cee..4e6ad314dce 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java @@ -93,4 +93,4 @@ public class MainProxy } private static String[] _args = new String[]{}; -}
\ No newline at end of file +} diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java index 64a0718824d..fa178e40271 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java @@ -1184,7 +1184,7 @@ public class SessionKeeper { Ice.LocatorPrx prx = Ice.LocatorPrxHelper.uncheckedCast( communicator.stringToProxy( - communicator.identityToString(locator.ice_getIdentity()) + + Ice.Util.identityToString(locator.ice_getIdentity()) + ":" + e.toString())); if(_directDiscoveryEndpointModel.indexOf(prx) == -1) @@ -2288,7 +2288,7 @@ public class SessionKeeper id.name = "Locator"; id.category = _directInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_directCustomEndpointValue.getText()); _coordinator.getCommunicator().stringToProxy(endpoint.toString()); @@ -2345,7 +2345,7 @@ public class SessionKeeper id.name = "router"; id.category = _routedInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_routedCustomEndpointValue.getText()); _coordinator.getCommunicator().stringToProxy(endpoint.toString()); @@ -3189,7 +3189,7 @@ public class SessionKeeper id.name = "Locator"; id.category = _directInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_directCustomEndpointValue.getText()); return containsSecureEndpoints(endpoint.toString()); @@ -3207,7 +3207,7 @@ public class SessionKeeper id.name = "router"; id.category = _routedInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_routedCustomEndpointValue.getText()); return containsSecureEndpoints(endpoint.toString()); @@ -3399,7 +3399,7 @@ public class SessionKeeper id.name = inf.getDirect() ? "Locator" : "router"; id.category = inf.getInstanceName(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(inf.getEndpoint()); ssl = containsSecureEndpoints(endpoint.toString()); diff --git a/java/test/controller/src/main/java/Test/Common/ControllerServer.java b/java/test/controller/src/main/java/Test/Common/ControllerServer.java index 866a3c29354..c90efc8e272 100644 --- a/java/test/controller/src/main/java/Test/Common/ControllerServer.java +++ b/java/test/controller/src/main/java/Test/Common/ControllerServer.java @@ -274,7 +274,7 @@ public class ControllerServer extends Ice.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControllerAdapter"); - adapter.add(new ControllerI(args), communicator().stringToIdentity("controller")); + adapter.add(new ControllerI(args), Ice.Util.stringToIdentity("controller")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/test/ejb/src/ejb1/com/zeroc/ejb/Client.java b/java/test/ejb/src/ejb1/com/zeroc/ejb/Client.java index 76c9e3d979f..b5314502149 100644 --- a/java/test/ejb/src/ejb1/com/zeroc/ejb/Client.java +++ b/java/test/ejb/src/ejb1/com/zeroc/ejb/Client.java @@ -65,4 +65,4 @@ public class Client extends Ice.Application int status = app.main("Client", args, initData); System.exit(status); } -};
\ No newline at end of file +}; diff --git a/java/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java b/java/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java index d75c06f8c59..04cc84e9dbd 100644 --- a/java/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java +++ b/java/test/ejb/src/ejb1/com/zeroc/ejb/DatabaseServer.java @@ -23,7 +23,7 @@ public class DatabaseServer extends Ice.Application } Ice.ObjectAdapter adapter = communicator().createObjectAdapterWithEndpoints("DB", "tcp -h localhost -p 10001"); - adapter.add(new DatabaseI(), communicator().stringToIdentity("db")); + adapter.add(new DatabaseI(), Ice.Util.stringToIdentity("db")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java b/java/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java index 09ab74f754f..eb0fa9a3a01 100644 --- a/java/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java +++ b/java/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java @@ -41,4 +41,4 @@ public class InitBean implements Init init() { } -}
\ No newline at end of file +} diff --git a/java/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java b/java/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java index 4140c7c8fd7..da731b86903 100644 --- a/java/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java +++ b/java/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java @@ -38,4 +38,4 @@ public class ServiceI extends _ServiceDisp { service.addAccount(s); } -}
\ No newline at end of file +} diff --git a/java/test/ejb/src/ejb2/com/zeroc/ejb/Client.java b/java/test/ejb/src/ejb2/com/zeroc/ejb/Client.java index f4ac4c7c5e7..9abfe9a5e99 100644 --- a/java/test/ejb/src/ejb2/com/zeroc/ejb/Client.java +++ b/java/test/ejb/src/ejb2/com/zeroc/ejb/Client.java @@ -65,4 +65,4 @@ public class Client extends Ice.Application int status = app.main("Client", args, initData); System.exit(status); } -};
\ No newline at end of file +}; diff --git a/java/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java b/java/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java index 6cd91dd3d11..f7ad76bd657 100644 --- a/java/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java +++ b/java/test/ejb/src/ejb2/com/zeroc/ejb/DatabaseServer.java @@ -23,7 +23,7 @@ public class DatabaseServer extends Ice.Application } Ice.ObjectAdapter adapter = communicator().createObjectAdapterWithEndpoints("DB", "tcp -h localhost -p 10002"); - adapter.add(new DatabaseI(), communicator().stringToIdentity("db")); + adapter.add(new DatabaseI(), Ice.Util.stringToIdentity("db")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java b/java/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java index 277f121cc79..236add0a74f 100644 --- a/java/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java +++ b/java/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java @@ -41,4 +41,4 @@ public class InitBean implements Init init() { } -}
\ No newline at end of file +} diff --git a/java/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java b/java/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java index 4140c7c8fd7..da731b86903 100644 --- a/java/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java +++ b/java/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java @@ -38,4 +38,4 @@ public class ServiceI extends _ServiceDisp { service.addAccount(s); } -}
\ No newline at end of file +} diff --git a/java/test/src/main/java/test/Glacier2/router/Client.java b/java/test/src/main/java/test/Glacier2/router/Client.java index a142a4bebf5..5bec46a2cec 100644 --- a/java/test/src/main/java/test/Glacier2/router/Client.java +++ b/java/test/src/main/java/test/Glacier2/router/Client.java @@ -305,7 +305,7 @@ public class Client extends test.Util.Application java.util.Map<String, String> context = new java.util.HashMap<String, String>(); context.put("_fwd", "t"); CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("c2/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("c2/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); callbackReceiverImpl.callbackOK(); out.println("ok"); @@ -319,7 +319,7 @@ public class Client extends test.Util.Application try { CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("c3/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("c3/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); test(false); } @@ -335,7 +335,7 @@ public class Client extends test.Util.Application java.util.Map<String, String> context = new java.util.HashMap<String, String>(); context.put("_fwd", "t"); CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast( - twoway.ice_identity(communicator().stringToIdentity("_userid/callback"))); + twoway.ice_identity(Ice.Util.stringToIdentity("_userid/callback"))); otherCategoryTwoway.initiateCallback(twowayR, context); callbackReceiverImpl.callbackOK(); out.println("ok"); diff --git a/java/test/src/main/java/test/Glacier2/router/Server.java b/java/test/src/main/java/test/Glacier2/router/Server.java index a8e74bbe63c..562b8647b4e 100644 --- a/java/test/src/main/java/test/Glacier2/router/Server.java +++ b/java/test/src/main/java/test/Glacier2/router/Server.java @@ -17,13 +17,13 @@ public class Server extends test.Util.Application communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); adapter.add(new CallbackI(), - communicator().stringToIdentity("c1/callback")); // The test allows "c1" as category. + Ice.Util.stringToIdentity("c1/callback")); // The test allows "c1" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("c2/callback")); // The test allows "c2" as category. + Ice.Util.stringToIdentity("c2/callback")); // The test allows "c2" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("c3/callback")); // The test rejects "c3" as category. + Ice.Util.stringToIdentity("c3/callback")); // The test rejects "c3" as category. adapter.add(new CallbackI(), - communicator().stringToIdentity("_userid/callback")); // The test allows the prefixed userid. + Ice.Util.stringToIdentity("_userid/callback")); // The test allows the prefixed userid. adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java index 770120f1aea..5e2108c78e0 100644 --- a/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java @@ -19,7 +19,7 @@ public class Server extends test.Util.Application communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); - adapter.add(new CallbackI(), communicator().stringToIdentity("callback")); + adapter.add(new CallbackI(), Ice.Util.stringToIdentity("callback")); adapter.activate(); communicator().waitForShutdown(); return 0; diff --git a/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java b/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java index 7dac87f5eba..f31b0030fbf 100644 --- a/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java +++ b/java/test/src/main/java/test/Ice/acm/RemoteObjectAdapterI.java @@ -19,7 +19,7 @@ public class RemoteObjectAdapterI extends _RemoteObjectAdapterDisp { _adapter = adapter; _testIntf = TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(), - _adapter.getCommunicator().stringToIdentity("test"))); + Ice.Util.stringToIdentity("test"))); _adapter.activate(); } diff --git a/java/test/src/main/java/test/Ice/acm/Server.java b/java/test/src/main/java/test/Ice/acm/Server.java index 81c4069f43c..8df16e0f21a 100644 --- a/java/test/src/main/java/test/Ice/acm/Server.java +++ b/java/test/src/main/java/test/Ice/acm/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("communicator"); + Ice.Identity id = Ice.Util.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/admin/AllTests.java b/java/test/src/main/java/test/Ice/admin/AllTests.java index 5e59a55782c..b1e622947c8 100644 --- a/java/test/src/main/java/test/Ice/admin/AllTests.java +++ b/java/test/src/main/java/test/Ice/admin/AllTests.java @@ -147,7 +147,7 @@ public class AllTests Ice.Communicator com = Ice.Util.initialize(init); test(com.getAdmin() == null); - Ice.Identity id = com.stringToIdentity("test-admin"); + Ice.Identity id = Ice.Util.stringToIdentity("test-admin"); try { com.createAdmin(null, id); diff --git a/java/test/src/main/java/test/Ice/admin/Server.java b/java/test/src/main/java/test/Ice/admin/Server.java index 49c11f870ea..f9ca817d7c0 100644 --- a/java/test/src/main/java/test/Ice/admin/Server.java +++ b/java/test/src/main/java/test/Ice/admin/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new RemoteCommunicatorFactoryI(), communicator.stringToIdentity("factory")); + adapter.add(new RemoteCommunicatorFactoryI(), Ice.Util.stringToIdentity("factory")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/ami/Collocated.java b/java/test/src/main/java/test/Ice/ami/Collocated.java index dda3d917716..429d4ed2dfd 100644 --- a/java/test/src/main/java/test/Ice/ami/Collocated.java +++ b/java/test/src/main/java/test/Ice/ami/Collocated.java @@ -17,9 +17,9 @@ public class Collocated extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator().stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Collocated test doesn't need to activate the OA - adapter2.add(new TestControllerI(adapter), communicator().stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); //adapter2.activate(); // Collocated test doesn't need to activate the OA AllTests.allTests(this, true); diff --git a/java/test/src/main/java/test/Ice/ami/Server.java b/java/test/src/main/java/test/Ice/ami/Server.java index 1f88cc0e66b..92c745419dd 100644 --- a/java/test/src/main/java/test/Ice/ami/Server.java +++ b/java/test/src/main/java/test/Ice/ami/Server.java @@ -18,9 +18,9 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); - adapter.add(new TestI(), communicator().stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); - adapter2.add(new TestControllerI(adapter), communicator().stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); adapter2.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/background/Server.java b/java/test/src/main/java/test/Ice/background/Server.java index 04036eb76f6..d0e0d298506 100644 --- a/java/test/src/main/java/test/Ice/background/Server.java +++ b/java/test/src/main/java/test/Ice/background/Server.java @@ -21,7 +21,7 @@ public class Server extends test.Util.Application { _controller.checkCallPause(current); Ice.Communicator communicator = current.adapter.getCommunicator(); - response.ice_response(current.adapter.createDirectProxy(communicator.stringToIdentity("dummy"))); + response.ice_response(current.adapter.createDirectProxy(Ice.Util.stringToIdentity("dummy"))); } @Override @@ -95,12 +95,12 @@ public class Server extends test.Util.Application BackgroundControllerI backgroundController = new BackgroundControllerI(configuration, adapter); - adapter.add(new BackgroundI(backgroundController), communicator().stringToIdentity("background")); - adapter.add(new LocatorI(backgroundController), communicator().stringToIdentity("locator")); - adapter.add(new RouterI(backgroundController), communicator().stringToIdentity("router")); + adapter.add(new BackgroundI(backgroundController), Ice.Util.stringToIdentity("background")); + adapter.add(new LocatorI(backgroundController), Ice.Util.stringToIdentity("locator")); + adapter.add(new RouterI(backgroundController), Ice.Util.stringToIdentity("router")); adapter.activate(); - adapter2.add(backgroundController, communicator().stringToIdentity("backgroundController")); + adapter2.add(backgroundController, Ice.Util.stringToIdentity("backgroundController")); adapter2.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/binding/AllTests.java b/java/test/src/main/java/test/Ice/binding/AllTests.java index 29268f11727..3c8a85c58bb 100644 --- a/java/test/src/main/java/test/Ice/binding/AllTests.java +++ b/java/test/src/main/java/test/Ice/binding/AllTests.java @@ -933,7 +933,7 @@ public class AllTests continue; // IP version not supported. } - String strPrx = oa.createProxy(serverCommunicator.stringToIdentity("dummy")).toString(); + String strPrx = oa.createProxy(Ice.Util.stringToIdentity("dummy")).toString(); for(Ice.Properties q : clientProps) { Ice.InitializationData clientInitData = app.createInitializationData(); diff --git a/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java b/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java index d3871e1602b..51aa5b24c84 100644 --- a/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java +++ b/java/test/src/main/java/test/Ice/binding/RemoteObjectAdapterI.java @@ -20,7 +20,7 @@ public class RemoteObjectAdapterI extends _RemoteObjectAdapterDisp { _adapter = adapter; _testIntf = TestIntfPrxHelper.uncheckedCast(_adapter.add(new TestI(), - _adapter.getCommunicator().stringToIdentity("test"))); + Ice.Util.stringToIdentity("test"))); _adapter.activate(); } diff --git a/java/test/src/main/java/test/Ice/binding/Server.java b/java/test/src/main/java/test/Ice/binding/Server.java index 51a4ce4f6c5..104b7e1eb03 100644 --- a/java/test/src/main/java/test/Ice/binding/Server.java +++ b/java/test/src/main/java/test/Ice/binding/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("communicator"); + Ice.Identity id = Ice.Util.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/checksum/Server.java b/java/test/src/main/java/test/Ice/checksum/Server.java index 0e9c69df45c..dffecaff213 100644 --- a/java/test/src/main/java/test/Ice/checksum/Server.java +++ b/java/test/src/main/java/test/Ice/checksum/Server.java @@ -19,7 +19,7 @@ public class Server extends test.Util.Application communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new ChecksumI(); - adapter.add(object, communicator.stringToIdentity("test")); + adapter.add(object, Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/classLoader/Server.java b/java/test/src/main/java/test/Ice/classLoader/Server.java index 6a8a658fc15..aef65c14aa3 100644 --- a/java/test/src/main/java/test/Ice/classLoader/Server.java +++ b/java/test/src/main/java/test/Ice/classLoader/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(adapter); - adapter.add(object, communicator.stringToIdentity("initial")); + adapter.add(object, Ice.Util.stringToIdentity("initial")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/custom/Collocated.java b/java/test/src/main/java/test/Ice/custom/Collocated.java index a2eaa077ac2..2c1e7b251f1 100644 --- a/java/test/src/main/java/test/Ice/custom/Collocated.java +++ b/java/test/src/main/java/test/Ice/custom/Collocated.java @@ -17,7 +17,7 @@ public class Collocated extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object test = new TestI(communicator); - adapter.add(test, communicator.stringToIdentity("test")); + adapter.add(test, Ice.Util.stringToIdentity("test")); AllTests.allTests(communicator, getWriter()); diff --git a/java/test/src/main/java/test/Ice/custom/Server.java b/java/test/src/main/java/test/Ice/custom/Server.java index 0779a84b5e1..8a4da565414 100644 --- a/java/test/src/main/java/test/Ice/custom/Server.java +++ b/java/test/src/main/java/test/Ice/custom/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object test = new TestI(communicator); - adapter.add(test, communicator.stringToIdentity("test")); + adapter.add(test, Ice.Util.stringToIdentity("test")); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/dispatcher/Collocated.java b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java index 37f1f2e4ab5..230321ada51 100644 --- a/java/test/src/main/java/test/Ice/dispatcher/Collocated.java +++ b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java @@ -18,9 +18,9 @@ public class Collocated extends test.Util.Application Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); assert(_dispatcher != null); - adapter.add(new TestI(_dispatcher), communicator().stringToIdentity("test")); + adapter.add(new TestI(_dispatcher), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. - adapter2.add(new TestControllerI(adapter), communicator().stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); //adapter2.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator(), getWriter(), _dispatcher); diff --git a/java/test/src/main/java/test/Ice/dispatcher/Server.java b/java/test/src/main/java/test/Ice/dispatcher/Server.java index 166f6e8ff0c..d962bbe1e28 100644 --- a/java/test/src/main/java/test/Ice/dispatcher/Server.java +++ b/java/test/src/main/java/test/Ice/dispatcher/Server.java @@ -19,9 +19,9 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); assert(_dispatcher != null); - adapter.add(new TestI(_dispatcher), communicator().stringToIdentity("test")); + adapter.add(new TestI(_dispatcher), Ice.Util.stringToIdentity("test")); adapter.activate(); - adapter2.add(new TestControllerI(adapter), communicator().stringToIdentity("testController")); + adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController")); adapter2.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/echo/Server.java b/java/test/src/main/java/test/Ice/echo/Server.java index 804813ffa55..07648551d38 100644 --- a/java/test/src/main/java/test/Ice/echo/Server.java +++ b/java/test/src/main/java/test/Ice/echo/Server.java @@ -46,7 +46,7 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); BlobjectI blob = new BlobjectI(); adapter.addDefaultServant(blob, ""); - adapter.add(new EchoI(blob), communicator().stringToIdentity("__echo")); + adapter.add(new EchoI(blob), Ice.Util.stringToIdentity("__echo")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/enums/Server.java b/java/test/src/main/java/test/Ice/enums/Server.java index bf3e966421a..69c4bf6459e 100644 --- a/java/test/src/main/java/test/Ice/enums/Server.java +++ b/java/test/src/main/java/test/Ice/enums/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object test = new TestIntfI(); - adapter.add(test, communicator.stringToIdentity("test")); + adapter.add(test, Ice.Util.stringToIdentity("test")); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java index 32d5ba99ca8..e7d8f9b0d1e 100644 --- a/java/test/src/main/java/test/Ice/exceptions/AMDServer.java +++ b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java @@ -19,9 +19,9 @@ public class AMDServer extends test.Util.Application Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2"); Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3"); Ice.Object object = new ThrowerI(); - adapter.add(object, communicator.stringToIdentity("thrower")); - adapter2.add(object, communicator.stringToIdentity("thrower")); - adapter3.add(object, communicator.stringToIdentity("thrower")); + adapter.add(object, Ice.Util.stringToIdentity("thrower")); + adapter2.add(object, Ice.Util.stringToIdentity("thrower")); + adapter3.add(object, Ice.Util.stringToIdentity("thrower")); adapter.activate(); adapter2.activate(); adapter3.activate(); diff --git a/java/test/src/main/java/test/Ice/exceptions/AllTests.java b/java/test/src/main/java/test/Ice/exceptions/AllTests.java index 4864434ca89..b417b1a427d 100644 --- a/java/test/src/main/java/test/Ice/exceptions/AllTests.java +++ b/java/test/src/main/java/test/Ice/exceptions/AllTests.java @@ -142,7 +142,7 @@ public class AllTests } catch(Ice.ObjectNotExistException ex) { - Ice.Identity id = _communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); test(ex.id.equals(id)); } catch(Throwable ex) @@ -765,10 +765,10 @@ public class AllTests communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter1"); Ice.Object obj = new EmptyI(); - adapter.add(obj, communicator.stringToIdentity("x")); + adapter.add(obj, Ice.Util.stringToIdentity("x")); try { - adapter.add(obj, communicator.stringToIdentity("x")); + adapter.add(obj, Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.AlreadyRegisteredException ex) @@ -777,7 +777,7 @@ public class AllTests try { - adapter.add(obj, communicator.stringToIdentity("")); + adapter.add(obj, Ice.Util.stringToIdentity("")); test(false); } catch(Ice.IllegalIdentityException ex) @@ -786,17 +786,17 @@ public class AllTests } try { - adapter.add(null, communicator.stringToIdentity("x")); + adapter.add(null, Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.IllegalServantException ex) { } - adapter.remove(communicator.stringToIdentity("x")); + adapter.remove(Ice.Util.stringToIdentity("x")); try { - adapter.remove(communicator.stringToIdentity("x")); + adapter.remove(Ice.Util.stringToIdentity("x")); test(false); } catch(Ice.NotRegisteredException ex) @@ -1166,7 +1166,7 @@ public class AllTests out.flush(); { - Ice.Identity id = communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); try { ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id)); @@ -1423,7 +1423,7 @@ public class AllTests out.flush(); { - Ice.Identity id = communicator.stringToIdentity("does not exist"); + Ice.Identity id = Ice.Util.stringToIdentity("does not exist"); ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id)); Callback_Thrower_throwAasAObjectNotExistI cb = new Callback_Thrower_throwAasAObjectNotExistI(communicator); thrower2.begin_throwAasA(1, cb); diff --git a/java/test/src/main/java/test/Ice/exceptions/Collocated.java b/java/test/src/main/java/test/Ice/exceptions/Collocated.java index 668d2e60039..87f9e730a2d 100644 --- a/java/test/src/main/java/test/Ice/exceptions/Collocated.java +++ b/java/test/src/main/java/test/Ice/exceptions/Collocated.java @@ -18,7 +18,7 @@ public class Collocated extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new ThrowerI(); - adapter.add(object, communicator.stringToIdentity("thrower")); + adapter.add(object, Ice.Util.stringToIdentity("thrower")); AllTests.allTests(communicator, getWriter()); diff --git a/java/test/src/main/java/test/Ice/exceptions/Server.java b/java/test/src/main/java/test/Ice/exceptions/Server.java index 0d797044138..d510ac1216f 100644 --- a/java/test/src/main/java/test/Ice/exceptions/Server.java +++ b/java/test/src/main/java/test/Ice/exceptions/Server.java @@ -19,9 +19,9 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2"); Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3"); Ice.Object object = new ThrowerI(); - adapter.add(object, communicator.stringToIdentity("thrower")); - adapter2.add(object, communicator.stringToIdentity("thrower")); - adapter3.add(object, communicator.stringToIdentity("thrower")); + adapter.add(object, Ice.Util.stringToIdentity("thrower")); + adapter2.add(object, Ice.Util.stringToIdentity("thrower")); + adapter3.add(object, Ice.Util.stringToIdentity("thrower")); adapter.activate(); adapter2.activate(); adapter3.activate(); diff --git a/java/test/src/main/java/test/Ice/facets/AllTests.java b/java/test/src/main/java/test/Ice/facets/AllTests.java index 60e641e959f..799a54f4ccf 100644 --- a/java/test/src/main/java/test/Ice/facets/AllTests.java +++ b/java/test/src/main/java/test/Ice/facets/AllTests.java @@ -59,20 +59,20 @@ public class AllTests communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter"); Ice.Object obj = new EmptyI(); - adapter.add(obj, communicator.stringToIdentity("d")); - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(obj, Ice.Util.stringToIdentity("d")); + adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD"); try { - adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD"); + adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD"); test(false); } catch(Ice.AlreadyRegisteredException ex) { } - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD"); + adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD"); try { - adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD"); + adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD"); test(false); } catch(Ice.NotRegisteredException ex) @@ -83,25 +83,25 @@ public class AllTests out.print("testing removeAllFacets... "); Ice.Object obj1 = new EmptyI(); Ice.Object obj2 = new EmptyI(); - adapter.addFacet(obj1, communicator.stringToIdentity("id1"), "f1"); - adapter.addFacet(obj2, communicator.stringToIdentity("id1"), "f2"); + adapter.addFacet(obj1, Ice.Util.stringToIdentity("id1"), "f1"); + adapter.addFacet(obj2, Ice.Util.stringToIdentity("id1"), "f2"); Ice.Object obj3 = new EmptyI(); - adapter.addFacet(obj1, communicator.stringToIdentity("id2"), "f1"); - adapter.addFacet(obj2, communicator.stringToIdentity("id2"), "f2"); - adapter.addFacet(obj3, communicator.stringToIdentity("id2"), ""); - java.util.Map<String, Ice.Object> fm = adapter.removeAllFacets(communicator.stringToIdentity("id1")); + adapter.addFacet(obj1, Ice.Util.stringToIdentity("id2"), "f1"); + adapter.addFacet(obj2, Ice.Util.stringToIdentity("id2"), "f2"); + adapter.addFacet(obj3, Ice.Util.stringToIdentity("id2"), ""); + java.util.Map<String, Ice.Object> fm = adapter.removeAllFacets(Ice.Util.stringToIdentity("id1")); test(fm.size() == 2); test(fm.get("f1") == obj1); test(fm.get("f2") == obj2); try { - adapter.removeAllFacets(communicator.stringToIdentity("id1")); + adapter.removeAllFacets(Ice.Util.stringToIdentity("id1")); test(false); } catch(Ice.NotRegisteredException ex) { } - fm = adapter.removeAllFacets(communicator.stringToIdentity("id2")); + fm = adapter.removeAllFacets(Ice.Util.stringToIdentity("id2")); test(fm.size() == 3); test(fm.get("f1") == obj1); test(fm.get("f2") == obj2); diff --git a/java/test/src/main/java/test/Ice/facets/Collocated.java b/java/test/src/main/java/test/Ice/facets/Collocated.java index b74f02d5e45..4d72172d030 100644 --- a/java/test/src/main/java/test/Ice/facets/Collocated.java +++ b/java/test/src/main/java/test/Ice/facets/Collocated.java @@ -18,12 +18,12 @@ public class Collocated extends test.Util.Application communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); - adapter.add(d, communicator.stringToIdentity("d")); - adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(d, Ice.Util.stringToIdentity("d")); + adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD"); Ice.Object f = new FI(); - adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF"); + adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF"); Ice.Object h = new HI(communicator); - adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH"); + adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH"); AllTests.allTests(communicator, getWriter()); diff --git a/java/test/src/main/java/test/Ice/facets/Server.java b/java/test/src/main/java/test/Ice/facets/Server.java index 486723faad7..533db9e28e3 100644 --- a/java/test/src/main/java/test/Ice/facets/Server.java +++ b/java/test/src/main/java/test/Ice/facets/Server.java @@ -17,12 +17,12 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); - adapter.add(d, communicator.stringToIdentity("d")); - adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD"); + adapter.add(d, Ice.Util.stringToIdentity("d")); + adapter.addFacet(d, Ice.Util.stringToIdentity("d"), "facetABCD"); Ice.Object f = new FI(); - adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF"); + adapter.addFacet(f, Ice.Util.stringToIdentity("d"), "facetEF"); Ice.Object h = new HI(communicator); - adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH"); + adapter.addFacet(h, Ice.Util.stringToIdentity("d"), "facetGH"); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/faultTolerance/Server.java b/java/test/src/main/java/test/Ice/faultTolerance/Server.java index 2d26de237f0..56e4041a168 100644 --- a/java/test/src/main/java/test/Ice/faultTolerance/Server.java +++ b/java/test/src/main/java/test/Ice/faultTolerance/Server.java @@ -65,7 +65,7 @@ public class Server extends test.Util.Application communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p " + port + ":udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new TestI(port); - adapter.add(object, communicator.stringToIdentity("test")); + adapter.add(object, Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/hold/Server.java b/java/test/src/main/java/test/Ice/hold/Server.java index 84becc3d3dd..2d3a1cf9652 100644 --- a/java/test/src/main/java/test/Ice/hold/Server.java +++ b/java/test/src/main/java/test/Ice/hold/Server.java @@ -18,10 +18,10 @@ public class Server extends test.Util.Application java.util.Timer timer = new java.util.Timer(); Ice.ObjectAdapter adapter1 = communicator.createObjectAdapter("TestAdapter1"); - adapter1.add(new HoldI(timer, adapter1), communicator.stringToIdentity("hold")); + adapter1.add(new HoldI(timer, adapter1), Ice.Util.stringToIdentity("hold")); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2"); - adapter2.add(new HoldI(timer, adapter2), communicator.stringToIdentity("hold")); + adapter2.add(new HoldI(timer, adapter2), Ice.Util.stringToIdentity("hold")); adapter1.activate(); adapter2.activate(); diff --git a/java/test/src/main/java/test/Ice/info/Server.java b/java/test/src/main/java/test/Ice/info/Server.java index df136602465..455e21046d0 100644 --- a/java/test/src/main/java/test/Ice/info/Server.java +++ b/java/test/src/main/java/test/Ice/info/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/inheritance/Collocated.java b/java/test/src/main/java/test/Ice/inheritance/Collocated.java index 369d56a699d..ac600d8f32c 100644 --- a/java/test/src/main/java/test/Ice/inheritance/Collocated.java +++ b/java/test/src/main/java/test/Ice/inheritance/Collocated.java @@ -17,7 +17,7 @@ public class Collocated extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(adapter); - adapter.add(object, communicator.stringToIdentity("initial")); + adapter.add(object, Ice.Util.stringToIdentity("initial")); AllTests.allTests(communicator, getWriter()); diff --git a/java/test/src/main/java/test/Ice/inheritance/Server.java b/java/test/src/main/java/test/Ice/inheritance/Server.java index dcfa8e06af4..a826ae1ec2f 100644 --- a/java/test/src/main/java/test/Ice/inheritance/Server.java +++ b/java/test/src/main/java/test/Ice/inheritance/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(adapter); - adapter.add(object, communicator.stringToIdentity("initial")); + adapter.add(object, Ice.Util.stringToIdentity("initial")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/interrupt/Collocated.java b/java/test/src/main/java/test/Ice/interrupt/Collocated.java index f94be8d3b21..61d24074a80 100644 --- a/java/test/src/main/java/test/Ice/interrupt/Collocated.java +++ b/java/test/src/main/java/test/Ice/interrupt/Collocated.java @@ -17,9 +17,9 @@ public class Collocated extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); TestControllerI controller = new TestControllerI(adapter); - adapter.add(new TestI(controller), communicator().stringToIdentity("test")); + adapter.add(new TestI(controller), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. - adapter2.add(controller, communicator().stringToIdentity("testController")); + adapter2.add(controller, Ice.Util.stringToIdentity("testController")); //adapter2.activate(); // Don't activate OA to ensure collocation is used. try diff --git a/java/test/src/main/java/test/Ice/interrupt/Server.java b/java/test/src/main/java/test/Ice/interrupt/Server.java index 12b670cafa6..0ab16417b99 100644 --- a/java/test/src/main/java/test/Ice/interrupt/Server.java +++ b/java/test/src/main/java/test/Ice/interrupt/Server.java @@ -19,9 +19,9 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); TestControllerI controller = new TestControllerI(adapter); - adapter.add(new TestI(controller), communicator().stringToIdentity("test")); + adapter.add(new TestI(controller), Ice.Util.stringToIdentity("test")); adapter.activate(); - adapter2.add(controller, communicator().stringToIdentity("testController")); + adapter2.add(controller, Ice.Util.stringToIdentity("testController")); adapter2.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/location/AllTests.java b/java/test/src/main/java/test/Ice/location/AllTests.java index 06eae325c60..33bada684a8 100644 --- a/java/test/src/main/java/test/Ice/location/AllTests.java +++ b/java/test/src/main/java/test/Ice/location/AllTests.java @@ -682,7 +682,7 @@ public class AllTests // Note the quotes are necessary here due to ":" in the // java generated UUID. HelloPrx helloPrx = HelloPrxHelper.checkedCast( - communicator.stringToProxy("\"" + communicator.identityToString(id) + "\"")); + communicator.stringToProxy("\"" + Ice.Util.identityToString(id) + "\"")); test(helloPrx.ice_getConnection() == null); adapter.deactivate(); diff --git a/java/test/src/main/java/test/Ice/location/Server.java b/java/test/src/main/java/test/Ice/location/Server.java index cf66d91c99e..1a3a98351be 100644 --- a/java/test/src/main/java/test/Ice/location/Server.java +++ b/java/test/src/main/java/test/Ice/location/Server.java @@ -31,15 +31,15 @@ public class Server extends test.Util.Application // 'servers' created with the server manager interface. // ServerLocatorRegistry registry = new ServerLocatorRegistry(); - registry.addObject(adapter.createProxy(communicator.stringToIdentity("ServerManager"))); + registry.addObject(adapter.createProxy(Ice.Util.stringToIdentity("ServerManager"))); Ice.Object object = new ServerManagerI(registry, _initData, this); - adapter.add(object, communicator.stringToIdentity("ServerManager")); + adapter.add(object, Ice.Util.stringToIdentity("ServerManager")); Ice.LocatorRegistryPrx registryPrx = Ice.LocatorRegistryPrxHelper.uncheckedCast(adapter.add(registry, - communicator.stringToIdentity("registry"))); + Ice.Util.stringToIdentity("registry"))); ServerLocator locator = new ServerLocator(registry, registryPrx); - adapter.add(locator, communicator.stringToIdentity("locator")); + adapter.add(locator, Ice.Util.stringToIdentity("locator")); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/location/ServerManagerI.java b/java/test/src/main/java/test/Ice/location/ServerManagerI.java index 1939375c795..293b9dcfb97 100644 --- a/java/test/src/main/java/test/Ice/location/ServerManagerI.java +++ b/java/test/src/main/java/test/Ice/location/ServerManagerI.java @@ -65,9 +65,9 @@ public class ServerManagerI extends _ServerManagerDisp adapter2.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator)); Ice.Object object = new TestI(adapter, adapter2, _registry); - _registry.addObject(adapter.add(object, serverCommunicator.stringToIdentity("test"))); - _registry.addObject(adapter.add(object, serverCommunicator.stringToIdentity("test2"))); - adapter.add(object, serverCommunicator.stringToIdentity("test3")); + _registry.addObject(adapter.add(object, Ice.Util.stringToIdentity("test"))); + _registry.addObject(adapter.add(object, Ice.Util.stringToIdentity("test2"))); + adapter.add(object, Ice.Util.stringToIdentity("test3")); adapter.activate(); adapter2.activate(); diff --git a/java/test/src/main/java/test/Ice/location/TestI.java b/java/test/src/main/java/test/Ice/location/TestI.java index 761e8be8fce..8f6e9eb6490 100644 --- a/java/test/src/main/java/test/Ice/location/TestI.java +++ b/java/test/src/main/java/test/Ice/location/TestI.java @@ -22,7 +22,7 @@ public class TestI extends _TestIntfDisp _adapter2 = adapter2; _registry = registry; - _registry.addObject(_adapter1.add(new HelloI(), _adapter1.getCommunicator().stringToIdentity("hello"))); + _registry.addObject(_adapter1.add(new HelloI(), Ice.Util.stringToIdentity("hello"))); } @Override @@ -37,21 +37,21 @@ public class TestI extends _TestIntfDisp getHello(Ice.Current current) { return HelloPrxHelper.uncheckedCast(_adapter1.createIndirectProxy( - _adapter1.getCommunicator().stringToIdentity("hello"))); + Ice.Util.stringToIdentity("hello"))); } @Override public HelloPrx getReplicatedHello(Ice.Current current) { - return HelloPrxHelper.uncheckedCast(_adapter1.createProxy(_adapter1.getCommunicator().stringToIdentity("hello"))); + return HelloPrxHelper.uncheckedCast(_adapter1.createProxy(Ice.Util.stringToIdentity("hello"))); } @Override public void migrateHello(Ice.Current current) { - final Ice.Identity id = _adapter1.getCommunicator().stringToIdentity("hello"); + final Ice.Identity id = Ice.Util.stringToIdentity("hello"); try { _registry.addObject(_adapter2.add(_adapter1.remove(id), id)); diff --git a/java/test/src/main/java/test/Ice/metrics/AMDServer.java b/java/test/src/main/java/test/Ice/metrics/AMDServer.java index a3d062eb09d..c936ca8d989 100644 --- a/java/test/src/main/java/test/Ice/metrics/AMDServer.java +++ b/java/test/src/main/java/test/Ice/metrics/AMDServer.java @@ -16,12 +16,12 @@ public class AMDServer extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new AMDMetricsI(), communicator.stringToIdentity("metrics")); + adapter.add(new AMDMetricsI(), Ice.Util.stringToIdentity("metrics")); adapter.activate(); communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); controllerAdapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/metrics/Collocated.java b/java/test/src/main/java/test/Ice/metrics/Collocated.java index 84740d7fc33..98320001330 100644 --- a/java/test/src/main/java/test/Ice/metrics/Collocated.java +++ b/java/test/src/main/java/test/Ice/metrics/Collocated.java @@ -19,12 +19,12 @@ public class Collocated extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MetricsI(), communicator.stringToIdentity("metrics")); + adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics")); //adapter.activate(); // Don't activate OA to ensure collocation is used. communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); //controllerAdapter.activate(); // Don't activate OA to ensure collocation is used. try diff --git a/java/test/src/main/java/test/Ice/metrics/Server.java b/java/test/src/main/java/test/Ice/metrics/Server.java index b2ec289b110..b4512bfdc4b 100644 --- a/java/test/src/main/java/test/Ice/metrics/Server.java +++ b/java/test/src/main/java/test/Ice/metrics/Server.java @@ -16,12 +16,12 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MetricsI(), communicator.stringToIdentity("metrics")); + adapter.add(new MetricsI(), Ice.Util.stringToIdentity("metrics")); adapter.activate(); communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice.ObjectAdapter controllerAdapter = communicator.createObjectAdapter("ControllerAdapter"); - controllerAdapter.add(new ControllerI(adapter), communicator.stringToIdentity("controller")); + controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller")); controllerAdapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/networkProxy/Server.java b/java/test/src/main/java/test/Ice/networkProxy/Server.java index 65e1623d374..1c0838f37a3 100644 --- a/java/test/src/main/java/test/Ice/networkProxy/Server.java +++ b/java/test/src/main/java/test/Ice/networkProxy/Server.java @@ -26,7 +26,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TestI(), communicator.stringToIdentity("test")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/objects/Collocated.java b/java/test/src/main/java/test/Ice/objects/Collocated.java index fd46f269d0d..3540ad70b0a 100644 --- a/java/test/src/main/java/test/Ice/objects/Collocated.java +++ b/java/test/src/main/java/test/Ice/objects/Collocated.java @@ -90,9 +90,9 @@ public class Collocated extends test.Util.Application communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Initial initial = new InitialI(adapter); - adapter.add(initial, communicator.stringToIdentity("initial")); + adapter.add(initial, Ice.Util.stringToIdentity("initial")); UnexpectedObjectExceptionTestI object = new UnexpectedObjectExceptionTestI(); - adapter.add(object, communicator.stringToIdentity("uoet")); + adapter.add(object, Ice.Util.stringToIdentity("uoet")); AllTests.allTests(communicator, getWriter()); // We must call shutdown even in the collocated case for cyclic // dependency cleanup diff --git a/java/test/src/main/java/test/Ice/objects/Server.java b/java/test/src/main/java/test/Ice/objects/Server.java index e513c71773a..49a7c0fa174 100644 --- a/java/test/src/main/java/test/Ice/objects/Server.java +++ b/java/test/src/main/java/test/Ice/objects/Server.java @@ -45,9 +45,9 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(adapter); - adapter.add(object, communicator.stringToIdentity("initial")); + adapter.add(object, Ice.Util.stringToIdentity("initial")); object = new UnexpectedObjectExceptionTestI(); - adapter.add(object, communicator.stringToIdentity("uoet")); + adapter.add(object, Ice.Util.stringToIdentity("uoet")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java index 7a9a61530b7..4beb59f070a 100644 --- a/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/AMDMyDerivedClassI.java @@ -308,7 +308,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass { MyClassPrx p2 = p1; MyClassPrx p3 = MyClassPrxHelper.uncheckedCast( - current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + current.adapter.createProxy(Ice.Util.stringToIdentity("noSuchIdentity"))); cb.ice_response(MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3); } diff --git a/java/test/src/main/java/test/Ice/operations/AMDServer.java b/java/test/src/main/java/test/Ice/operations/AMDServer.java index e8e92a095a3..25437cbe39b 100644 --- a/java/test/src/main/java/test/Ice/operations/AMDServer.java +++ b/java/test/src/main/java/test/Ice/operations/AMDServer.java @@ -16,7 +16,7 @@ public class AMDServer extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new AMDMyDerivedClassI(), communicator().stringToIdentity("test")); + adapter.add(new AMDMyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java index 8b78ab51efd..ed2c9c3f618 100644 --- a/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/AMDTieMyDerivedClassI.java @@ -272,7 +272,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations { MyClassPrx p2 = p1; MyClassPrx p3 = MyClassPrxHelper.uncheckedCast( - current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + current.adapter.createProxy(Ice.Util.stringToIdentity("noSuchIdentity"))); cb.ice_response(MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3); } diff --git a/java/test/src/main/java/test/Ice/operations/AMDTieServer.java b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java index 99a9378f7a6..1e18aa3fa0d 100644 --- a/java/test/src/main/java/test/Ice/operations/AMDTieServer.java +++ b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java @@ -18,7 +18,7 @@ public class AMDTieServer extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new _MyDerivedClassTie(new AMDTieMyDerivedClassI()), communicator().stringToIdentity("test")); + adapter.add(new _MyDerivedClassTie(new AMDTieMyDerivedClassI()), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/operations/Collocated.java b/java/test/src/main/java/test/Ice/operations/Collocated.java index 0d2dc641986..b10f13a54e0 100644 --- a/java/test/src/main/java/test/Ice/operations/Collocated.java +++ b/java/test/src/main/java/test/Ice/operations/Collocated.java @@ -17,7 +17,7 @@ public class Collocated extends test.Util.Application communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); java.io.PrintWriter out = getWriter(); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), communicator().stringToIdentity("test")); + Ice.ObjectPrx prx = adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. if(prx.ice_getConnection() != null) diff --git a/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java index a0b09d438d3..2e55b054b6f 100644 --- a/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/MyDerivedClassI.java @@ -262,7 +262,7 @@ public final class MyDerivedClassI extends MyDerivedClass { p2.value = p1; p3.value = MyClassPrxHelper.uncheckedCast( - current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + current.adapter.createProxy(Ice.Util.stringToIdentity("noSuchIdentity"))); return MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } diff --git a/java/test/src/main/java/test/Ice/operations/Server.java b/java/test/src/main/java/test/Ice/operations/Server.java index 0ba1baaa161..ae7d1de57bd 100644 --- a/java/test/src/main/java/test/Ice/operations/Server.java +++ b/java/test/src/main/java/test/Ice/operations/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator().stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java index 34c55945ed3..e18d6b4f058 100644 --- a/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java +++ b/java/test/src/main/java/test/Ice/operations/TieMyDerivedClassI.java @@ -226,7 +226,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations { p2.value = p1; p3.value = MyClassPrxHelper.uncheckedCast( - current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); + current.adapter.createProxy(Ice.Util.stringToIdentity("noSuchIdentity"))); return MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } diff --git a/java/test/src/main/java/test/Ice/operations/TieServer.java b/java/test/src/main/java/test/Ice/operations/TieServer.java index 5f6d757635a..189fe433be7 100644 --- a/java/test/src/main/java/test/Ice/operations/TieServer.java +++ b/java/test/src/main/java/test/Ice/operations/TieServer.java @@ -18,7 +18,7 @@ public class TieServer extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new _MyDerivedClassTie(new TieMyDerivedClassI()), communicator().stringToIdentity("test")); + adapter.add(new _MyDerivedClassTie(new TieMyDerivedClassI()), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/operations/Twoways.java b/java/test/src/main/java/test/Ice/operations/Twoways.java index 0a8d61f6397..cea51fc11c9 100644 --- a/java/test/src/main/java/test/Ice/operations/Twoways.java +++ b/java/test/src/main/java/test/Ice/operations/Twoways.java @@ -258,9 +258,9 @@ class Twoways test(Util.proxyIdentityAndFacetCompare(c1.value, p) == 0); test(Util.proxyIdentityAndFacetCompare(c2.value, p) != 0); test(Util.proxyIdentityAndFacetCompare(r, p) == 0); - test(c1.value.ice_getIdentity().equals(communicator.stringToIdentity("test"))); - test(c2.value.ice_getIdentity().equals(communicator.stringToIdentity("noSuchIdentity"))); - test(r.ice_getIdentity().equals(communicator.stringToIdentity("test"))); + test(c1.value.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); + test(c2.value.ice_getIdentity().equals(Ice.Util.stringToIdentity("noSuchIdentity"))); + test(r.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); r.opVoid(); c1.value.opVoid(); try diff --git a/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java index 4bb600ab39c..bd9701c27c5 100644 --- a/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java +++ b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java @@ -426,9 +426,9 @@ class TwowaysAMI @Override public void response(MyClassPrx r, MyClassPrx c1, MyClassPrx c2) { - test(c1.ice_getIdentity().equals(_communicator.stringToIdentity("test"))); - test(c2.ice_getIdentity().equals(_communicator.stringToIdentity("noSuchIdentity"))); - test(r.ice_getIdentity().equals(_communicator.stringToIdentity("test"))); + test(c1.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); + test(c2.ice_getIdentity().equals(Ice.Util.stringToIdentity("noSuchIdentity"))); + test(r.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); // We can't do the callbacks below in connection serialization mode. if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0) { diff --git a/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java b/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java index 056b66f8b12..204790269c7 100644 --- a/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java +++ b/java/test/src/main/java/test/Ice/operations/lambda/TwowaysLambdaAMI.java @@ -257,9 +257,9 @@ public class TwowaysLambdaAMI public void response(MyClassPrx r, MyClassPrx c1, MyClassPrx c2) { - test(c1.ice_getIdentity().equals(_communicator.stringToIdentity("test"))); - test(c2.ice_getIdentity().equals(_communicator.stringToIdentity("noSuchIdentity"))); - test(r.ice_getIdentity().equals(_communicator.stringToIdentity("test"))); + test(c1.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); + test(c2.ice_getIdentity().equals(Ice.Util.stringToIdentity("noSuchIdentity"))); + test(r.ice_getIdentity().equals(Ice.Util.stringToIdentity("test"))); // We can't do the callbacks below in connection serialization mode. if(_communicator.getProperties().getPropertyAsInt("Ice.ThreadPool.Client.Serialize") == 0) { diff --git a/java/test/src/main/java/test/Ice/optional/AMDServer.java b/java/test/src/main/java/test/Ice/optional/AMDServer.java index 0cb4d4644b8..99cab219be1 100644 --- a/java/test/src/main/java/test/Ice/optional/AMDServer.java +++ b/java/test/src/main/java/test/Ice/optional/AMDServer.java @@ -16,7 +16,7 @@ public class AMDServer extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new AMDInitialI(), communicator().stringToIdentity("initial")); + adapter.add(new AMDInitialI(), Ice.Util.stringToIdentity("initial")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/optional/Server.java b/java/test/src/main/java/test/Ice/optional/Server.java index 51da67cbdc2..d4429d5a94d 100644 --- a/java/test/src/main/java/test/Ice/optional/Server.java +++ b/java/test/src/main/java/test/Ice/optional/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new InitialI(), communicator().stringToIdentity("initial")); + adapter.add(new InitialI(), Ice.Util.stringToIdentity("initial")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/packagemd/Server.java b/java/test/src/main/java/test/Ice/packagemd/Server.java index 9cd17d0755a..2f7abf04cf4 100644 --- a/java/test/src/main/java/test/Ice/packagemd/Server.java +++ b/java/test/src/main/java/test/Ice/packagemd/Server.java @@ -17,7 +17,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(); - adapter.add(object, communicator.stringToIdentity("initial")); + adapter.add(object, Ice.Util.stringToIdentity("initial")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/proxy/AMDServer.java b/java/test/src/main/java/test/Ice/proxy/AMDServer.java index 1bf3e6461c0..82defd2909a 100644 --- a/java/test/src/main/java/test/Ice/proxy/AMDServer.java +++ b/java/test/src/main/java/test/Ice/proxy/AMDServer.java @@ -16,7 +16,7 @@ public class AMDServer extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new AMDMyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new AMDMyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/proxy/AllTests.java b/java/test/src/main/java/test/Ice/proxy/AllTests.java index 6d0ffdee136..d5471d4510a 100644 --- a/java/test/src/main/java/test/Ice/proxy/AllTests.java +++ b/java/test/src/main/java/test/Ice/proxy/AllTests.java @@ -270,11 +270,11 @@ public class AllTests // Test for bug ICE-5543: escaped escapes in stringToIdentity // Ice.Identity id = new Ice.Identity("test", ",X2QNUAzSBcJ_e$AV;E\\"); - Ice.Identity id2 = communicator.stringToIdentity(communicator.identityToString(id)); + Ice.Identity id2 = Ice.Util.stringToIdentity(Ice.Util.identityToString(id)); test(id.equals(id2)); id = new Ice.Identity("test", ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\"); - id2 = communicator.stringToIdentity(communicator.identityToString(id)); + id2 = Ice.Util.stringToIdentity(Ice.Util.identityToString(id)); test(id.equals(id2)); out.println("ok"); @@ -463,6 +463,8 @@ public class AllTests out.flush(); test(communicator.identityToString( base.ice_identity(communicator.stringToIdentity("other")).ice_getIdentity()).equals("other")); + test(Ice.Util.identityToString( + base.ice_identity(Ice.Util.stringToIdentity("other")).ice_getIdentity()).equals("other")); test(base.ice_facet("facet").ice_getFacet().equals("facet")); test(base.ice_adapterId("id").ice_getAdapterId().equals("id")); test(base.ice_twoway().ice_isTwoway()); diff --git a/java/test/src/main/java/test/Ice/proxy/Collocated.java b/java/test/src/main/java/test/Ice/proxy/Collocated.java index ed82d121277..5823e8d25c5 100644 --- a/java/test/src/main/java/test/Ice/proxy/Collocated.java +++ b/java/test/src/main/java/test/Ice/proxy/Collocated.java @@ -17,7 +17,7 @@ public class Collocated extends test.Util.Application Ice.Communicator communicator = communicator(); communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator, getWriter()); diff --git a/java/test/src/main/java/test/Ice/proxy/Server.java b/java/test/src/main/java/test/Ice/proxy/Server.java index cd77788ef97..fd6252a37d1 100644 --- a/java/test/src/main/java/test/Ice/proxy/Server.java +++ b/java/test/src/main/java/test/Ice/proxy/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); + adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/retry/Collocated.java b/java/test/src/main/java/test/Ice/retry/Collocated.java index 996c78c25d1..1faf02f0889 100644 --- a/java/test/src/main/java/test/Ice/retry/Collocated.java +++ b/java/test/src/main/java/test/Ice/retry/Collocated.java @@ -19,7 +19,7 @@ public class Collocated extends test.Util.Application setupObjectAdapter(Ice.Communicator communicator) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter(""); - adapter.add(new RetryI(), communicator.stringToIdentity("retry")); + adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry")); //adapter.activate(); // Don't activate OA to ensure collocation is used. } diff --git a/java/test/src/main/java/test/Ice/retry/Server.java b/java/test/src/main/java/test/Ice/retry/Server.java index d639187ad1b..8d4a4f6209e 100644 --- a/java/test/src/main/java/test/Ice/retry/Server.java +++ b/java/test/src/main/java/test/Ice/retry/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new RetryI(), communicator.stringToIdentity("retry")); + adapter.add(new RetryI(), Ice.Util.stringToIdentity("retry")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java index ac608d9e0ea..e19857ff333 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java +++ b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java @@ -16,7 +16,7 @@ public class AMDServer extends test.Util.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new AMDMyClassI(), communicator().stringToIdentity("test")); + adapter.add(new AMDMyClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/seqMapping/Collocated.java b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java index 52069bbeca1..755e0248197 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/Collocated.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java @@ -17,7 +17,7 @@ public class Collocated extends test.Util.Application { java.io.PrintWriter out = getWriter(); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator().stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); //adapter.activate(); // Don't activate OA to ensure collocation is used. AllTests.allTests(communicator(), true, out); diff --git a/java/test/src/main/java/test/Ice/seqMapping/Server.java b/java/test/src/main/java/test/Ice/seqMapping/Server.java index 548d3086217..21eff24ab1c 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/Server.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new MyClassI(), communicator().stringToIdentity("test")); + adapter.add(new MyClassI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/serialize/Server.java b/java/test/src/main/java/test/Ice/serialize/Server.java index 70219d964fa..a0658f19668 100644 --- a/java/test/src/main/java/test/Ice/serialize/Server.java +++ b/java/test/src/main/java/test/Ice/serialize/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - Ice.Identity ident = communicator().stringToIdentity("initial"); + Ice.Identity ident = Ice.Util.stringToIdentity("initial"); Ice.Object object = new InitialI(adapter, ident); adapter.add(object, ident); adapter.activate(); diff --git a/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java index 6e6ffc665f9..77f66d39142 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java +++ b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java @@ -18,8 +18,8 @@ public class AMDServer extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); adapter.addServantLocator(new AMDServantLocatorI("category"), "category"); adapter.addServantLocator(new AMDServantLocatorI(""), ""); - adapter.add(new AMDTestI(), communicator().stringToIdentity("asm")); - adapter.add(new AMDTestActivationI(), communicator().stringToIdentity("test/activation")); + adapter.add(new AMDTestI(), Ice.Util.stringToIdentity("asm")); + adapter.add(new AMDTestActivationI(), Ice.Util.stringToIdentity("test/activation")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/servantLocator/Collocated.java b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java index a77705f8145..6e4fbf4e820 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/Collocated.java +++ b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java @@ -17,8 +17,8 @@ public class Collocated extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); adapter.addServantLocator(new ServantLocatorI("category"), "category"); adapter.addServantLocator(new ServantLocatorI(""), ""); - adapter.add(new TestI(), communicator().stringToIdentity("asm")); - adapter.add(new TestActivationI(), communicator().stringToIdentity("test/activation")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("asm")); + adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation")); AllTests.allTests(communicator(), getWriter()); return 0; diff --git a/java/test/src/main/java/test/Ice/servantLocator/Server.java b/java/test/src/main/java/test/Ice/servantLocator/Server.java index 2704cf9e434..9559c24a7a4 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/Server.java +++ b/java/test/src/main/java/test/Ice/servantLocator/Server.java @@ -17,8 +17,8 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); adapter.addServantLocator(new ServantLocatorI("category"), "category"); adapter.addServantLocator(new ServantLocatorI(""), ""); - adapter.add(new TestI(), communicator().stringToIdentity("asm")); - adapter.add(new TestActivationI(), communicator().stringToIdentity("test/activation")); + adapter.add(new TestI(), Ice.Util.stringToIdentity("asm")); + adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java index a0e2bf24649..220b71f7e03 100644 --- a/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java @@ -16,7 +16,7 @@ public class AMDServer extends test.Util.Application { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.Object object = new AMDTestI(); - adapter.add(object, communicator().stringToIdentity("Test")); + adapter.add(object, Ice.Util.stringToIdentity("Test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java index f56e422e8d0..529194081fe 100644 --- a/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java +++ b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java @@ -17,7 +17,7 @@ public class AMDServer extends test.Util.Application Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new AMDTestI(); - adapter.add(object, communicator.stringToIdentity("Test")); + adapter.add(object, Ice.Util.stringToIdentity("Test")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java index 6af09354e47..68ae4707319 100644 --- a/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java +++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); - adapter.add(new PriorityI(), communicator().stringToIdentity("test")); + adapter.add(new PriorityI(), Ice.Util.stringToIdentity("test")); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/Ice/throughput/Server.java b/java/test/src/main/java/test/Ice/throughput/Server.java index 9313d235b79..fb81f2fc963 100644 --- a/java/test/src/main/java/test/Ice/throughput/Server.java +++ b/java/test/src/main/java/test/Ice/throughput/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("Throughput"); - adapter.add(new ThroughputI(), communicator().stringToIdentity("throughput")); + adapter.add(new ThroughputI(), Ice.Util.stringToIdentity("throughput")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/timeout/Server.java b/java/test/src/main/java/test/Ice/timeout/Server.java index 17e75826a1e..3d4982f6305 100644 --- a/java/test/src/main/java/test/Ice/timeout/Server.java +++ b/java/test/src/main/java/test/Ice/timeout/Server.java @@ -16,7 +16,7 @@ public class Server extends test.Util.Application { Ice.Communicator communicator = communicator(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new TimeoutI(), communicator.stringToIdentity("timeout")); + adapter.add(new TimeoutI(), Ice.Util.stringToIdentity("timeout")); adapter.activate(); return WAIT; } diff --git a/java/test/src/main/java/test/Ice/udp/Server.java b/java/test/src/main/java/test/Ice/udp/Server.java index 1cca643df30..02b6fca4ab1 100644 --- a/java/test/src/main/java/test/Ice/udp/Server.java +++ b/java/test/src/main/java/test/Ice/udp/Server.java @@ -26,21 +26,21 @@ public class Server extends test.Util.Application } properties.setProperty("ControlAdapter.Endpoints", "tcp -p " + port); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter"); - adapter.add(new TestIntfI(), communicator().stringToIdentity("control")); + adapter.add(new TestIntfI(), Ice.Util.stringToIdentity("control")); adapter.activate(); if(port == 12010) { properties.setProperty("TestAdapter.Endpoints", "udp -p 12010"); Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("TestAdapter"); - adapter2.add(new TestIntfI(), communicator().stringToIdentity("test")); + adapter2.add(new TestIntfI(), Ice.Util.stringToIdentity("test")); adapter2.activate(); } if(!isAndroid()) { Ice.ObjectAdapter mcastAdapter = communicator().createObjectAdapter("McastTestAdapter"); - mcastAdapter.add(new TestIntfI(), communicator().stringToIdentity("test")); + mcastAdapter.add(new TestIntfI(), Ice.Util.stringToIdentity("test")); mcastAdapter.activate(); } diff --git a/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java b/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java index 1f6b33c47e7..d12a648b819 100644 --- a/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java +++ b/java/test/src/main/java/test/IceBox/configuration/TestServiceI.java @@ -18,7 +18,7 @@ public class TestServiceI implements IceBox.Service communicator.getProperties().setProperty("Ice.Package.Test", "test.IceBox.configuration"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter(name + "OA"); - adapter.add(new TestI(args), communicator.stringToIdentity("test")); + adapter.add(new TestI(args), Ice.Util.stringToIdentity("test")); adapter.activate(); } diff --git a/java/test/src/main/java/test/IceDiscovery/simple/Server.java b/java/test/src/main/java/test/IceDiscovery/simple/Server.java index 71fdd790be4..28db45ec264 100644 --- a/java/test/src/main/java/test/IceDiscovery/simple/Server.java +++ b/java/test/src/main/java/test/IceDiscovery/simple/Server.java @@ -30,7 +30,7 @@ public class Server extends test.Util.Application properties.setProperty("ControlAdapter.ThreadPool.Size", "1"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter"); - adapter.add(new ControllerI(), communicator().stringToIdentity("controller" + num)); + adapter.add(new ControllerI(), Ice.Util.stringToIdentity("controller" + num)); adapter.activate(); return WAIT; diff --git a/java/test/src/main/java/test/IceGrid/simple/Server.java b/java/test/src/main/java/test/IceGrid/simple/Server.java index 408ab6a1488..e1ea3916029 100644 --- a/java/test/src/main/java/test/IceGrid/simple/Server.java +++ b/java/test/src/main/java/test/IceGrid/simple/Server.java @@ -21,7 +21,7 @@ public class Server extends test.Util.Application Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.Object object = new TestI(); String id = communicator().getProperties().getPropertyWithDefault("Identity", "test"); - adapter.add(object, communicator().stringToIdentity(id)); + adapter.add(object, Ice.Util.stringToIdentity(id)); //shutdownOnInterrupt(); try { diff --git a/java/test/src/main/java/test/IceSSL/configuration/Server.java b/java/test/src/main/java/test/IceSSL/configuration/Server.java index 22e1187bbb3..54aeb9a9f0f 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/Server.java +++ b/java/test/src/main/java/test/IceSSL/configuration/Server.java @@ -18,7 +18,7 @@ public class Server extends test.Util.Application Ice.Communicator communicator = communicator(); communicator.getProperties().setProperty("TestAdapter.Endpoints", "tcp -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Identity id = communicator.stringToIdentity("factory"); + Ice.Identity id = Ice.Util.stringToIdentity("factory"); adapter.add(new ServerFactoryI(), id); adapter.activate(); diff --git a/java/test/src/main/java/test/Slice/keyword/Client.java b/java/test/src/main/java/test/Slice/keyword/Client.java index e619268afa6..c972b6320f1 100644 --- a/java/test/src/main/java/test/Slice/keyword/Client.java +++ b/java/test/src/main/java/test/Slice/keyword/Client.java @@ -161,13 +161,13 @@ public class Client run(String[] args, Ice.Communicator communicator) { Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new defaultI(), communicator.stringToIdentity("test")); + adapter.add(new defaultI(), Ice.Util.stringToIdentity("test")); adapter.activate(); System.out.print("Testing operation name... "); System.out.flush(); defaultPrx p = defaultPrxHelper.uncheckedCast( - adapter.createProxy(communicator.stringToIdentity("test"))); + adapter.createProxy(Ice.Util.stringToIdentity("test"))); p._do(); System.out.println("ok"); |