Update exception message to be more generic so it is not misleading

Signed-off-by: Steven Ayers <[email protected]>
delta-io · Sep 16, 2024 · c410c53 · c410c53
1 parent 856a392
commit c410c53
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/client/src/main/scala/io/delta/sharing/client/DeltaSharingProfileProvider.scala b/client/src/main/scala/io/delta/sharing/client/DeltaSharingProfileProvider.scala
@@ -41,7 +41,7 @@ sealed trait DeltaSharingProfile {
   private [client] def validate(): Unit = {
     if (shareCredentialsVersion.isEmpty) {
       throw new IllegalArgumentException(
-        "Cannot find the 'shareCredentialsVersion' field in the profile file")
+        "Cannot find the 'shareCredentialsVersion' field in the profile")
     }
 
     if (shareCredentialsVersion.get > DeltaSharingProfile.CURRENT) {
@@ -143,14 +143,14 @@ object DeltaSharingProfile {
   private [client] def validateNotNullAndEmpty(fieldValue: String,
                                                fieldName: String): Unit = {
     if (fieldValue == null || fieldValue.isEmpty) {
-      throw new IllegalArgumentException(s"Cannot find the '$fieldName' field in the profile file")
+      throw new IllegalArgumentException(s"Cannot find the '$fieldName' field in the profile")
     }
   }
 
   private [client] def validateNotNullAndEmpty(fieldValue: Option[Long],
                                                fieldName: String): Unit = {
     if (fieldValue == null || fieldValue.isEmpty) {
-      throw new IllegalArgumentException(s"Cannot find the '$fieldName' field in the profile file")
+      throw new IllegalArgumentException(s"Cannot find the '$fieldName' field in the profile")
     }
   }
 }

diff --git a/client/src/test/scala/io/delta/sharing/client/DeltaSharingFileProfileProviderSuite.scala b/client/src/test/scala/io/delta/sharing/client/DeltaSharingFileProfileProviderSuite.scala
@@ -82,7 +82,7 @@ class DeltaSharingFileProfileProviderSuite extends SparkFunSuite {
       )
     }
     assert(e.getMessage.contains(
-      "Cannot find the 'shareCredentialsVersion' field in the profile file"))
+      "Cannot find the 'shareCredentialsVersion' field in the profile"))
   }
 
   test("shareCredentialsVersion is incorrect") {
@@ -126,7 +126,7 @@ class DeltaSharingFileProfileProviderSuite extends SparkFunSuite {
         null
       )
     }
-    assert(e.getMessage.contains("Cannot find the 'endpoint' field in the profile file"))
+    assert(e.getMessage.contains("Cannot find the 'endpoint' field in the profile"))
   }
 
   test("bearerToken is missing") {
@@ -140,7 +140,7 @@ class DeltaSharingFileProfileProviderSuite extends SparkFunSuite {
         null
       )
     }
-    assert(e.getMessage.contains("Cannot find the 'bearerToken' field in the profile file"))
+    assert(e.getMessage.contains("Cannot find the 'bearerToken' field in the profile"))
   }
 
   test("unknown field should be ignored") {
@@ -241,7 +241,7 @@ class DeltaSharingFileProfileProviderSuite extends SparkFunSuite {
       val e = intercept[IllegalArgumentException] {
         testProfile(profile, null)
       }
-      assert(e.getMessage.contains(s"Cannot find the '$missingField' field in the profile file"))
+      assert(e.getMessage.contains(s"Cannot find the '$missingField' field in the profile"))
     }
   }
 

diff --git a/client/src/test/scala/io/delta/sharing/client/DeltaSharingOptionsProfileProviderSuite.scala b/client/src/test/scala/io/delta/sharing/client/DeltaSharingOptionsProfileProviderSuite.scala
@@ -71,7 +71,7 @@ class DeltaSharingOptionsProfileProviderSuite extends SparkFunSuite {
       )
     }
     assert(e.getMessage.contains(
-      "Cannot find the 'shareCredentialsVersion' field in the profile file"))
+      "Cannot find the 'shareCredentialsVersion' field in the profile"))
   }
 
   test("shareCredentialsVersion is incorrect") {
@@ -112,7 +112,7 @@ class DeltaSharingOptionsProfileProviderSuite extends SparkFunSuite {
         null
       )
     }
-    assert(e.getMessage.contains("Cannot find the 'endpoint' field in the profile file"))
+    assert(e.getMessage.contains("Cannot find the 'endpoint' field in the profile"))
   }
 
   test("bearerToken is missing") {
@@ -125,7 +125,7 @@ class DeltaSharingOptionsProfileProviderSuite extends SparkFunSuite {
         null
       )
     }
-    assert(e.getMessage.contains("Cannot find the 'bearerToken' field in the profile file"))
+    assert(e.getMessage.contains("Cannot find the 'bearerToken' field in the profile"))
   }
 
   test("unknown field should be ignored") {
@@ -221,7 +221,7 @@ class DeltaSharingOptionsProfileProviderSuite extends SparkFunSuite {
       val e = intercept[IllegalArgumentException] {
         testProfile(profile, null)
       }
-      assert(e.getMessage.contains(s"Cannot find the '$missingField' field in the profile file"))
+      assert(e.getMessage.contains(s"Cannot find the '$missingField' field in the profile"))
     }
   }