Deprecate Communicator::stringToIdentity and identityToString

3 files changed, 21 insertions, 21 deletions

diff --git a/python/test/Ice/facets/AllTests.py b/python/test/Ice/facets/AllTests.py
index e6fa69e3d01..4f804da33f7 100644
--- a/python/test/Ice/facets/AllTests.py
+++ b/python/test/Ice/facets/AllTests.py
@@ -45,16 +45,16 @@ def allTests(communicator):
     communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default")
     adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter")
     obj = EmptyI()
-    adapter.add(obj, communicator.stringToIdentity("d"))
-    adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD")
+    adapter.add(obj, Ice.stringToIdentity("d"))
+    adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD")
     try:
-        adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD")
+        adapter.addFacet(obj, Ice.stringToIdentity("d"), "facetABCD")
         test(false)
     except Ice.AlreadyRegisteredException:
         pass
-    adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD")
+    adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD")
     try:
-        adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD")
+        adapter.removeFacet(Ice.stringToIdentity("d"), "facetABCD")
         test(false)
     except Ice.NotRegisteredException:
         pass
@@ -64,22 +64,22 @@ def allTests(communicator):
     sys.stdout.flush()
     obj1 = EmptyI()
     obj2 = EmptyI()
-    adapter.addFacet(obj1, communicator.stringToIdentity("id1"), "f1")
-    adapter.addFacet(obj2, communicator.stringToIdentity("id1"), "f2")
+    adapter.addFacet(obj1, Ice.stringToIdentity("id1"), "f1")
+    adapter.addFacet(obj2, Ice.stringToIdentity("id1"), "f2")
     obj3 = EmptyI()
-    adapter.addFacet(obj1, communicator.stringToIdentity("id2"), "f1")
-    adapter.addFacet(obj2, communicator.stringToIdentity("id2"), "f2")
-    adapter.addFacet(obj3, communicator.stringToIdentity("id2"), "")
-    fm = adapter.removeAllFacets(communicator.stringToIdentity("id1"))
+    adapter.addFacet(obj1, Ice.stringToIdentity("id2"), "f1")
+    adapter.addFacet(obj2, Ice.stringToIdentity("id2"), "f2")
+    adapter.addFacet(obj3, Ice.stringToIdentity("id2"), "")
+    fm = adapter.removeAllFacets(Ice.stringToIdentity("id1"))
     test(len(fm) == 2)
     test(fm["f1"] == obj1)
     test(fm["f2"] == obj2)
     try:
-        adapter.removeAllFacets(communicator.stringToIdentity("id1"))
+        adapter.removeAllFacets(Ice.stringToIdentity("id1"))
         test(false)
     except Ice.NotRegisteredException:
         pass
-    fm = adapter.removeAllFacets(communicator.stringToIdentity("id2"))
+    fm = adapter.removeAllFacets(Ice.stringToIdentity("id2"))
     test(len(fm) == 3)
     test(fm["f1"] == obj1)
     test(fm["f2"] == obj2)
diff --git a/python/test/Ice/facets/Collocated.py b/python/test/Ice/facets/Collocated.py
index 18e25a4baf0..5936768fbdc 100755
--- a/python/test/Ice/facets/Collocated.py
+++ b/python/test/Ice/facets/Collocated.py
@@ -18,12 +18,12 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     d = TestI.DI()
-    adapter.add(d, communicator.stringToIdentity("d"))
-    adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD")
+    adapter.add(d, Ice.stringToIdentity("d"))
+    adapter.addFacet(d, Ice.stringToIdentity("d"), "facetABCD")
     f = TestI.FI()
-    adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF")
+    adapter.addFacet(f, Ice.stringToIdentity("d"), "facetEF")
     h = TestI.HI(communicator)
-    adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH")
+    adapter.addFacet(h, Ice.stringToIdentity("d"), "facetGH")
 
     #adapter.activate() // Don't activate OA to ensure collocation is used.
 
diff --git a/python/test/Ice/facets/Server.py b/python/test/Ice/facets/Server.py
index 0c9b334d1b7..e00238e0834 100755
--- a/python/test/Ice/facets/Server.py
+++ b/python/test/Ice/facets/Server.py
@@ -18,12 +18,12 @@ def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
     adapter = communicator.createObjectAdapter("TestAdapter")
     d = TestI.DI()
-    adapter.add(d, communicator.stringToIdentity("d"))
-    adapter.addFacet(d, communicator.stringToIdentity("d"), "facetABCD")
+    adapter.add(d, Ice.stringToIdentity("d"))
+    adapter.addFacet(d, Ice.stringToIdentity("d"), "facetABCD")
     f = TestI.FI()
-    adapter.addFacet(f, communicator.stringToIdentity("d"), "facetEF")
+    adapter.addFacet(f, Ice.stringToIdentity("d"), "facetEF")
     h = TestI.HI(communicator)
-    adapter.addFacet(h, communicator.stringToIdentity("d"), "facetGH")
+    adapter.addFacet(h, Ice.stringToIdentity("d"), "facetGH")
 
     adapter.activate()
     communicator.waitForShutdown()