Merge pull request #242 from google/FF0F89A9FFB90668CB5E5C968FD01756

(AUTOMATIC) opensource update

Author: battre

common/build.gradle

@@ -53,7 +53,7 @@ repositories {
 
 dependencies {
   api 'com.google.errorprone:error_prone_annotations:2.18.0'
-  api 'org.jspecify:jspecify:0.2.0'
+  api 'org.jspecify:jspecify:0.3.0'
   implementation 'com.google.guava:guava-gwt:18.0'
   /* Note that gradle will warn about this not being the same version as *
    * the Android JSON library (but will not compile if it's removed).    */

common/src/main/java/com/google/i18n/addressinput/common/AddressData.java

@@ -26,7 +26,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.jspecify.nullness.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * An immutable data structure for international postal addresses, built using the nested

common/src/main/java/com/google/i18n/addressinput/common/AddressVerificationData.java

@@ -23,7 +23,7 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.jspecify.nullness.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Wraps a Map of address property data to provide the AddressVerificationData API.

common/src/main/java/com/google/i18n/addressinput/common/ClientData.java

@@ -25,7 +25,7 @@
 import java.util.logging.Logger;
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.jspecify.nullness.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Access point for the cached address verification data. The data contained here will mainly be

common/src/main/java/com/google/i18n/addressinput/common/FormController.java

@@ -22,7 +22,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
-import org.jspecify.nullness.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Responsible for looking up data for address fields. This fetches possible

common/src/main/java/com/google/i18n/addressinput/common/FormatInterpreter.java

@@ -27,7 +27,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
-import org.jspecify.nullness.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Address format interpreter. A utility to find address format related info.

common/src/main/java/com/google/i18n/addressinput/common/JsoMap.java

@@ -22,7 +22,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
-import org.jspecify.nullness.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Compatibility methods on top of the JSON data.

common/src/main/java/com/google/i18n/addressinput/common/LookupKey.java

@@ -19,7 +19,7 @@
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.Map;
-import org.jspecify.nullness.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A builder for creating keys that are used to lookup data in the local cache and fetch data from

common/src/main/java/com/google/i18n/addressinput/common/Util.java

@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.jspecify.nullness.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Utility functions used by the address widget.

cpp/include/libaddressinput/preload_supplier.h

@@ -98,7 +98,7 @@ class PreloadSupplier : public Supplier {
 
  private:
   bool GetRuleHierarchy(const LookupKey& lookup_key, RuleHierarchy* hierarchy,
-                        const bool search_globally) const;
+                        bool search_globally) const;
   bool IsLoadedKey(const std::string& key) const;
   bool IsPendingKey(const std::string& key) const;