Use getIceProperty in Swift (#2947)

zeroc-ice · Oct 21, 2024 · fbee227 · fbee227
1 parent dbbea9e
commit fbee227
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 31 deletions.
diff --git a/swift/src/Ice/CommunicatorI.swift b/swift/src/Ice/CommunicatorI.swift
@@ -13,17 +13,14 @@ class CommunicatorI: LocalObject<ICECommunicator>, Communicator {
     init(handle: ICECommunicator, initData: InitializationData) {
         defaultsAndOverrides = DefaultsAndOverrides(handle: handle)
         self.initData = initData
-        let num = initData.properties!.getPropertyAsIntWithDefault(
-            key: "Ice.ClassGraphDepthMax", value: 10)
+        let num = try! initData.properties!.getIcePropertyAsInt("Ice.ClassGraphDepthMax")
         if num < 1 || num > 0x7FFF_FFFF {
             classGraphDepthMax = 0x7FFF_FFFF
         } else {
             classGraphDepthMax = num
         }
-        traceSlicing =
-            initData.properties!.getPropertyAsIntWithDefault(key: "Ice.Trace.Slicing", value: 0) > 0
-        acceptClassCycles =
-            initData.properties!.getPropertyAsIntWithDefault(key: "Ice.AcceptClassCycles", value: 0) > 0
+        traceSlicing = try! initData.properties!.getIcePropertyAsInt("Ice.Trace.Slicing") > 0
+        acceptClassCycles = try! initData.properties!.getIcePropertyAsInt("Ice.AcceptClassCycles") > 0
 
         super.init(handle: handle)
     }

diff --git a/swift/test/Ice/binding/AllTests.swift b/swift/test/Ice/binding/AllTests.swift
@@ -536,7 +536,7 @@ func testSecureEndpoints(helper: TestHelper, com: RemoteCommunicatorPrx) async t
 
     let output = helper.getWriter()
 
-    if helper.communicator().getProperties().getProperty("Ice.Default.Protocol") == "ssl" {
+    if try helper.communicator().getProperties().getIceProperty("Ice.Default.Protocol") == "ssl" {
         output.write("testing unsecure vs. secure endpoints... ")
         do {
             let adapters = try await [

diff --git a/swift/test/Ice/enums/AllTests.swift b/swift/test/Ice/enums/AllTests.swift
@@ -61,7 +61,7 @@ func allTests(_ helper: TestHelper) async throws -> TestIntfPrx {
     output.write("testing enum streaming... ")
 
     let encoding_1_0 =
-        communicator.getProperties().getProperty("Ice.Default.EncodingVersion") == "1.0"
+        try communicator.getProperties().getIceProperty("Ice.Default.EncodingVersion") == "1.0"
 
     var ostr = Ice.OutputStream(communicator: communicator)
     ostr.write(ByteEnum.benum11)

diff --git a/swift/test/Ice/facets/AllTests.swift b/swift/test/Ice/facets/AllTests.swift
@@ -14,22 +14,22 @@ func allTests(_ helper: TestHelper) async throws -> GPrx {
     let communicator = helper.communicator()
 
     output.write("testing Ice.Admin.Facets property... ")
-    try test(communicator.getProperties().getPropertyAsList("Ice.Admin.Facets").count == 0)
+    try test(communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets").count == 0)
     communicator.getProperties().setProperty(key: "Ice.Admin.Facets", value: "foobar")
-    var facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets")
+    var facetFilter = try communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
     try test(facetFilter == ["foobar"])
     communicator.getProperties().setProperty(key: "Ice.Admin.Facets", value: "foo\\'bar")
-    facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets")
+    facetFilter = try communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
     try test(facetFilter == ["foo'bar"])
     communicator.getProperties().setProperty(key: "Ice.Admin.Facets", value: "'foo bar' toto 'titi'")
-    facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets")
+    facetFilter = try communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
     try test(facetFilter == ["foo bar", "toto", "titi"])
     communicator.getProperties().setProperty(
         key: "Ice.Admin.Facets", value: "'foo bar\\' toto' 'titi'")
-    facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets")
+    facetFilter = try communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets")
     try test(facetFilter == ["foo bar' toto", "titi"])
     // communicator.getProperties().setProperty("Ice.Admin.Facets", "'foo bar' 'toto titi");
-    // facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
+    // facetFilter = try communicator.getProperties().getIcePropertyAsList("Ice.Admin.Facets");
     // test(facetFilter.Length == 0);
     communicator.getProperties().setProperty(key: "Ice.Admin.Facets", value: "")
     output.writeLine("ok")

diff --git a/swift/test/Ice/info/AllTests.swift b/swift/test/Ice/info/AllTests.swift
@@ -83,7 +83,7 @@ func allTests(_ helper: TestHelper) async throws {
 
     output.write("test object adapter endpoint information... ")
     do {
-        let host = communicator.getProperties().getPropertyAsInt("Ice.IPv6") != 0 ? "::1" : "127.0.0.1"
+        let host = try communicator.getProperties().getIcePropertyAsInt("Ice.IPv6") != 0 ? "::1" : "127.0.0.1"
         communicator.getProperties().setProperty(
             key: "TestAdapter.Endpoints",
             value: "tcp -h \"\(host)\" -t 15000:udp -h \"\(host)\"")
@@ -149,7 +149,7 @@ func allTests(_ helper: TestHelper) async throws {
 
     let testIntf = try await checkedCast(prx: base, type: TestIntfPrx.self)!
 
-    let defaultHost = communicator.getProperties().getProperty("Ice.Default.Host")
+    let defaultHost = try communicator.getProperties().getIceProperty("Ice.Default.Host")
 
     output.write("test connection endpoint information... ")
     do {

diff --git a/swift/test/Ice/objects/TestI.swift b/swift/test/Ice/objects/TestI.swift
@@ -159,7 +159,7 @@ class InitialI: Initial {
 
     func acceptsClassCycles(current: Ice.Current) async throws -> Bool {
         let properties = current.adapter.getCommunicator().getProperties()
-        return properties.getPropertyAsIntWithDefault(key: "Ice.AcceptClassCycles", value: 0) > 0
+        return try properties.getIcePropertyAsInt("Ice.AcceptClassCycles") > 0
     }
 
     func getD1(d1: D1?, current _: Ice.Current) async throws -> D1? {

diff --git a/swift/test/Ice/operations/BatchOneways.swift b/swift/test/Ice/operations/BatchOneways.swift
@@ -72,7 +72,7 @@ func batchOneways(_ helper: TestHelper, _ p: MyClassPrx) async throws {
     conn = try await p.ice_getConnection()
     if supportsCompress,
         conn != nil,
-        p.ice_getCommunicator().getProperties().getProperty("Ice.Override.Compress") == ""
+        try! p.ice_getCommunicator().getProperties().getIceProperty("Ice.Override.Compress") == ""
     {
         let prx = try await p.ice_getConnection()!.createProxy(p.ice_getIdentity()).ice_batchOneway()
 

diff --git a/swift/test/Ice/properties/Client.swift b/swift/test/Ice/properties/Client.swift
@@ -22,10 +22,10 @@ public class Client: TestHelperI {
             output.write("testing load properties from UTF-8 path... ")
             let properties = Ice.createProperties()
             try properties.load("./config/中国_client.config")
-            try test(properties.getProperty("Ice.Trace.Network") == "1")
-            try test(properties.getProperty("Ice.Trace.Protocol") == "1")
+            try test(properties.getIceProperty("Ice.Trace.Network") == "1")
+            try test(properties.getIceProperty("Ice.Trace.Protocol") == "1")
             try test(properties.getProperty("Config.Path") == "./config/中国_client.config")
-            try test(properties.getProperty("Ice.ProgramName") == "PropertiesClient")
+            try test(properties.getIceProperty("Ice.ProgramName") == "PropertiesClient")
             output.writeLine("ok")
         }
 
@@ -79,8 +79,8 @@ public class Client: TestHelperI {
             var args1 = ["--Foo=1", "--Ice.Default.InvocationTimeout=12345", "-T", "--Bar=2"]
             let properties1 = try Ice.createProperties(args1)
             var properties2 = try Ice.createProperties(&args1)
-            try test(properties1.getPropertyAsInt("Ice.Default.InvocationTimeout") == 12345)
-            try test(properties2.getPropertyAsInt("Ice.Default.InvocationTimeout") == 12345)
+            try test(properties1.getIcePropertyAsInt("Ice.Default.InvocationTimeout") == 12345)
+            try test(properties2.getIcePropertyAsInt("Ice.Default.InvocationTimeout") == 12345)
             try test(args1 == ["--Foo=1", "-T", "--Bar=2"])
 
             args1 = ["--Ice.Default.InvocationTimeout=10000"]
@@ -92,7 +92,7 @@ public class Client: TestHelperI {
             defer {
                 communicator.destroy()
             }
-            try test(communicator.getProperties().getPropertyAsInt("Ice.Default.InvocationTimeout") == 12345)
+            try test(communicator.getProperties().getIcePropertyAsInt("Ice.Default.InvocationTimeout") == 12345)
             try test(args1 == ["--Foo=1", "-T", "--Bar=2"])
             output.writeLine("ok")
         }

diff --git a/swift/test/Ice/proxy/AllTests.swift b/swift/test/Ice/proxy/AllTests.swift
@@ -856,7 +856,7 @@ public func allTests(_ helper: TestHelper) async throws -> MyClassPrx {
         "test -e 1.1:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==")!
     try test(communicator.proxyToString(p2) == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000")
 
-    if communicator.getProperties().getPropertyAsInt("Ice.IPv6") == 0 {
+    if try communicator.getProperties().getIcePropertyAsInt("Ice.IPv6") == 0 {
         // Two legal TCP endpoints expressed as opaque endpoints
         p1 = try communicator.stringToProxy(
             "test -e 1.0:" + "opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:"

diff --git a/swift/test/Ice/stream/Client.swift b/swift/test/Ice/stream/Client.swift
@@ -186,7 +186,7 @@ public class Client: TestHelperI {
             try inS.readPendingValues()
             try test(o2!.bo == o.bo)
             try test(o2!.by == o.by)
-            if communicator.getProperties().getProperty("Ice.Default.EncodingVersion") == "1.0" {
+            if try communicator.getProperties().getIceProperty("Ice.Default.EncodingVersion") == "1.0" {
                 try test(o2!.sh == nil)
                 try test(o2!.i == nil)
             } else {

diff --git a/swift/test/Ice/udp/AllTests.swift b/swift/test/Ice/udp/AllTests.swift
@@ -83,7 +83,7 @@ public func allTests(_ helper: TestHelper) async throws {
     }
     try test(ret)
 
-    if communicator.getProperties().getPropertyAsInt("Ice.Override.Compress") == 0 {
+    if try communicator.getProperties().getIcePropertyAsInt("Ice.Override.Compress") == 0 {
         //
         // Only run this test if compression is disabled, the test expect fixed message size
         // to be sent over the wire.
@@ -125,7 +125,7 @@ public func allTests(_ helper: TestHelper) async throws {
     //
     // Use loopback to prevent other machines to answer.
     //
-    if communicator.getProperties().getProperty("Ice.IPv6") == "1" {
+    if try communicator.getProperties().getIceProperty("Ice.IPv6") == "1" {
         endpoint += "udp -h \"ff15::1:1\" --interface \"::1\""
     } else {
         endpoint += "udp -h 239.255.1.1 --interface 127.0.0.1"
@@ -140,7 +140,7 @@ public func allTests(_ helper: TestHelper) async throws {
         do {
             try await objMcast.ping(reply)
             ret = replyI.waitReply(expectedReplies: 5, timeout: 5000)
-        } catch is Ice.SocketException where communicator.getProperties().getProperty("Ice.IPv6") == "1" {
+        } catch is Ice.SocketException where try! communicator.getProperties().getIceProperty("Ice.IPv6") == "1" {
             output.write("(not supported) ")
             ret = true
         }

diff --git a/swift/test/Ice/udp/Server.swift b/swift/test/Ice/udp/Server.swift
@@ -35,7 +35,7 @@ class Server: TestHelperI {
         //
         // Use loopback to prevent other machines to answer.
         //
-        if properties.getProperty("Ice.IPv6") == "1" {
+        if try properties.getIceProperty("Ice.IPv6") == "1" {
             endpoint += "udp -h \"ff15::1:1\" --interface \"::1\""
         } else {
             endpoint += "udp -h 239.255.1.1 --interface 127.0.0.1"

diff --git a/swift/test/TestCommon/TestCommon.swift b/swift/test/TestCommon/TestCommon.swift
@@ -99,7 +99,7 @@ open class TestHelperI: TestHelper {
         var s = ""
         s +=
             (prot == "")
-            ? properties.getPropertyWithDefault(key: "Ice.Default.Protocol", value: "default") : prot
+            ? try! properties.getIceProperty("Ice.Default.Protocol") : prot
         s += " -p "
         let port = properties.getPropertyAsIntWithDefault(key: "Test.BasePort", value: 12010) + num
         s += String(port)