Fixes

zeroc-ice · May 17, 2024 · 5f3f154 · 5f3f154
1 parent 10fd28b
commit 5f3f154
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/cpp/src/Ice/Properties.cpp b/cpp/src/Ice/Properties.cpp
@@ -103,7 +103,7 @@ namespace
         optional<Property> prop = findProperty(key, false);
         if (!prop)
         {
-            throw invalid_argument{"unknown ice property: " + string{key}};
+            throw invalid_argument{"unknown Ice property: " + string{key}};
         }
         return prop->defaultValue;
     }
@@ -351,7 +351,7 @@ Ice::Properties::setProperty(string_view key, string_view value)
     // If the property is deprecated, log a warning.
     if (prop && prop->deprecated)
     {
-        getProcessLogger()->warning("deprecated property: " + string{key});
+        getProcessLogger()->warning("setting deprecated property: " + string{key});
     }
 
     lock_guard lock(_mutex);

diff --git a/csharp/src/Ice/Properties.cs b/csharp/src/Ice/Properties.cs
@@ -355,7 +355,7 @@ public void setProperty(string key, string val)
         // If the property is deprecated, log a warning.
         if (prop is not null && prop.deprecated)
         {
-            Util.getProcessLogger().warning("deprecated property: " + key);
+            Util.getProcessLogger().warning("setting deprecated property: " + key);
         }
 
         lock (this)
@@ -810,7 +810,7 @@ private void loadConfig()
     private static string getDefaultProperty(string key)
     {
         // Find the property, don't log any warnings.
-        Property? prop = findProperty(key, false) ?? throw new ArgumentException("unknown ice property: " + key);
+        Property? prop = findProperty(key, false) ?? throw new ArgumentException("unknown Ice property: " + key);
         return prop.defaultValue;
     }
 

diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/Properties.java b/java/src/Ice/src/main/java/com/zeroc/Ice/Properties.java
@@ -353,7 +353,7 @@ public void setProperty(String key, String value) {
 
     // If the property is deprecated, log a warning
     if (prop != null && prop.deprecated()) {
-      Util.getProcessLogger().warning("deprecated property: " + key);
+      Util.getProcessLogger().warning("setting deprecated property: " + key);
     }
 
     synchronized (this) {
@@ -814,7 +814,7 @@ private static Property findProperty(String key, Boolean logWarnings) {
 
       if (matches) {
         if (prop.deprecated() && logWarnings) {
-          logger.warning("deprecated property: " + key);
+          logger.warning("setting deprecated property: " + key);
         }
         return prop;
       }
@@ -836,7 +836,7 @@ private static Property findProperty(String key, Boolean logWarnings) {
   private static String getDefaultProperty(String key) {
     Property prop = findProperty(key, false);
     if (prop == null) {
-      throw new IllegalArgumentException("unknown ice property: " + key);
+      throw new IllegalArgumentException("unknown Ice property: " + key);
     }
     return prop.defaultValue();
   }

diff --git a/js/src/Ice/PropertiesI.js b/js/src/Ice/PropertiesI.js
@@ -182,7 +182,7 @@ class Properties
         // If the property is deprecated, log a warning
         if (prop !== null && prop.deprecated)
         {
-            getProcessLogger().warning("deprecated property: " + key);
+            getProcessLogger().warning("setting deprecated property: " + key);
         }
 
         //
@@ -524,7 +524,7 @@ class Properties
         const prop = Properties.findProperty(key, false);
         if (prop === null)
         {
-            throw new Error("unknown ice property: " + key);
+            throw new Error("unknown Ice property: " + key);
         }
         return prop.defaultValue;
     }

diff --git a/js/test/Ice/properties/Client.js b/js/test/Ice/properties/Client.js
@@ -127,7 +127,7 @@
                 }
                 catch(ex)
                 {
-                    test(ex.message == "unknown ice property: Ice.UnknownProperty");
+                    test(ex.message == "unknown Ice property: Ice.UnknownProperty");
                 }
                 out.writeLine("ok");
             }

diff --git a/php/test/Ice/properties/Client.php b/php/test/Ice/properties/Client.php
@@ -59,7 +59,7 @@ function run($args)
             test(False);
         } catch (Ice\UnknownException $ex) {
             // We don't have a specific exception for unknown properties
-            test($ex->unknown == "unknown ice property: Ice.UnknownProperty");
+            test($ex->unknown == "unknown Ice property: Ice.UnknownProperty");
         }
         echo "ok\n";
     }

diff --git a/ruby/test/Ice/properties/Client.rb b/ruby/test/Ice/properties/Client.rb
@@ -104,7 +104,7 @@ def run(args)
             properties.getIceProperty("Ice.UnknownProperty")
             test(false)
         rescue RuntimeError => ex
-            test ex.to_s == "unknown ice property: Ice.UnknownProperty"
+            test ex.to_s == "unknown Ice property: Ice.UnknownProperty"
         end
         puts "ok"
 

diff --git a/swift/src/Ice/PropertiesI.swift b/swift/src/Ice/PropertiesI.swift
@@ -11,7 +11,7 @@ class PropertiesI: LocalObject<ICEProperties>, Properties {
 
   public func getIceProperty(_ key: String) throws -> String {
     guard let value = handle.getIceProperty(key) else {
-      throw RuntimeError("unknown ice property: \(key)")
+      throw RuntimeError("unknown Ice property: \(key)")
     }
     return value
   }
@@ -26,7 +26,7 @@ class PropertiesI: LocalObject<ICEProperties>, Properties {
 
   public func getIcePropertyAsInt(_ key: String) throws -> Int32 {
     guard let value = handle.getIcePropertyAsInt(key) as? Int32 else {
-      throw RuntimeError("unknown ice property: \(key)")
+      throw RuntimeError("unknown Ice property: \(key)")
     }
     return value
   }
@@ -41,7 +41,7 @@ class PropertiesI: LocalObject<ICEProperties>, Properties {
 
   public func getIcePropertyAsList(_ key: String) throws -> StringSeq {
     guard let value = handle.getIcePropertyAsList(key) else {
-      throw RuntimeError("unknown ice property: \(key)")
+      throw RuntimeError("unknown Ice property: \(key)")
     }
     return value
   }

diff --git a/swift/test/Ice/properties/Client.swift b/swift/test/Ice/properties/Client.swift
@@ -138,7 +138,7 @@ public class Client: TestHelperI {
         _ = try properties.getIceProperty("Ice.UnknownProperty")
         try test(false)
       } catch let error as RuntimeError {
-        try test(error.description == "unknown ice property: Ice.UnknownProperty")
+        try test(error.description == "unknown Ice property: Ice.UnknownProperty")
       }
 
       output.write("ok")