Use javax.annotation.Nullable instead of androidx.annotation.Nullable…

… to decouple Android dependency (#23310)

* Use JSR305 Annotations instead of Android:annotations

* Address review comments

examples/java-matter-controller/BUILD.gn

@@ -23,21 +23,16 @@ android_binary("java-matter-controller") {
   output_name = "java-matter-controller"
 
   deps = [
-    ":android",
     "${chip_root}/src/controller/java",
     "${chip_root}/src/setup_payload/java",
-    "${chip_root}/third_party/android_deps:annotation",
+    "${chip_root}/third_party/java_deps:annotation",
   ]
 
   sources = [ "java/src/com/matter/controller/Main.java" ]
 
   javac_flags = [ "-Xlint:deprecation" ]
 }
 
-java_prebuilt("android") {
-  jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
-}
-
 group("default") {
   deps = [ ":java-matter-controller" ]
 }

scripts/build/builders/android.py

@@ -310,6 +310,11 @@ def generate(self):
             title="Setting up Android deps through Gradle",
         )
 
+        self._Execute(
+            ["third_party/java_deps/set_up_java_deps.sh"],
+            title="Setting up Java deps",
+        )
+
         if not os.path.exists(self.output_dir):
             # NRF does a in-place update  of SDK tools
             if not self._runner.dry_run:

scripts/build/testdata/dry_run_android-arm64-chip-tool.txt

@@ -4,6 +4,9 @@ cd "{root}"
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
+# Setting up Java deps
+third_party/java_deps/set_up_java_deps.sh
+
 # Generating android-arm64-chip-tool
 gn gen --check --fail-on-unused-args {out}/android-arm64-chip-tool '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" '
 

src/controller/java/BUILD.gn

@@ -69,7 +69,7 @@ android_library("java") {
 
   deps = [
     ":android",
-    "${chip_root}/third_party/android_deps:annotation",
+    "${chip_root}/third_party/java_deps:annotation",
   ]
 
   data_deps = [

src/controller/java/src/chip/devicecontroller/ChipDeviceController.java

@@ -19,13 +19,13 @@
 
 import android.bluetooth.BluetoothGatt;
 import android.util.Log;
-import androidx.annotation.Nullable;
 import chip.devicecontroller.GetConnectedDeviceCallbackJni.GetConnectedDeviceCallback;
 import chip.devicecontroller.model.ChipAttributePath;
 import chip.devicecontroller.model.ChipEventPath;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import javax.annotation.Nullable;
 
 /** Controller to interact with the CHIP device. */
 public class ChipDeviceController {

src/controller/java/src/chip/devicecontroller/ControllerParams.java

@@ -1,6 +1,6 @@
 package chip.devicecontroller;
 
-import androidx.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /** Parameters representing initialization arguments for {@link ChipDeviceController}. */
 public final class ControllerParams {

src/controller/java/src/chip/devicecontroller/NetworkCredentials.java

@@ -19,7 +19,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import androidx.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /** Class for holding WiFi or Thread credentials, but not both. */
 public class NetworkCredentials implements Parcelable {

src/controller/java/src/chip/devicecontroller/OperationalKeyConfig.java

@@ -1,6 +1,6 @@
 package chip.devicecontroller;
 
-import androidx.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /** Represents a set of operating credentials for a ChipDeviceController. */
 public final class OperationalKeyConfig {

src/controller/java/src/chip/devicecontroller/ReportCallbackJni.java

@@ -17,7 +17,7 @@
  */
 package chip.devicecontroller;
 
-import androidx.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /** JNI wrapper callback class for {@link ReportCallback}. */
 public class ReportCallbackJni {

src/controller/java/src/chip/devicecontroller/ReportEventCallbackJni.java

@@ -17,7 +17,7 @@
  */
 package chip.devicecontroller;
 
-import androidx.annotation.Nullable;
+import javax.annotation.Nullable;
 
 /** JNI wrapper callback class for {@link ReportCallback}. */
 public class ReportEventCallbackJni {

src/controller/java/src/chip/devicecontroller/model/ClusterState.java

@@ -17,10 +17,10 @@
  */
 package chip.devicecontroller.model;
 
-import androidx.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.Optional;
+import javax.annotation.Nullable;
 
 /** Class for tracking CHIP cluster state in a hierarchical manner. */
 public final class ClusterState {

src/controller/java/src/chip/devicecontroller/model/EndpointState.java

@@ -17,8 +17,8 @@
  */
 package chip.devicecontroller.model;
 
-import androidx.annotation.Nullable;
 import java.util.Map;
+import javax.annotation.Nullable;
 
 /** Class for tracking CHIP endpoint state in a hierarchical manner. */
 public final class EndpointState {

src/controller/java/src/chip/devicecontroller/model/NodeState.java

@@ -17,10 +17,10 @@
  */
 package chip.devicecontroller.model;
 
-import androidx.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import javax.annotation.Nullable;
 
 /** Class for tracking CHIP node state in a hierarchical manner. */
 public final class NodeState {

src/controller/java/templates/ChipClusters-java.zapt

@@ -3,7 +3,7 @@
 
 package chip.devicecontroller;
 
-import androidx.annotation.Nullable;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

src/controller/java/templates/ChipEventStructs-java.zapt

@@ -2,7 +2,7 @@
 package chip.devicecontroller;
 
 {{#if (chip_has_client_clusters)}}
-import androidx.annotation.Nullable;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Optional;

src/controller/java/templates/ChipStructs-java.zapt

@@ -2,7 +2,7 @@
 package chip.devicecontroller;
 
 {{#if (chip_has_client_clusters)}}
-import androidx.annotation.Nullable;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Optional;

src/controller/java/templates/ClusterInfo-java.zapt

@@ -3,14 +3,14 @@
 
 package chip.devicecontroller;
 
-import androidx.annotation.Nullable;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import androidx.annotation.Nullable;
+import javax.annotation.Nullable;
 import chip.clusterinfo.ClusterInfo;
 import chip.clusterinfo.InteractionInfo;
 import chip.clusterinfo.CommandParameterInfo;

third_party/java_deps/.gitignore

@@ -0,0 +1 @@
+artifacts/

third_party/java_deps/BUILD.gn

@@ -0,0 +1,22 @@
+# Copyright (c) 2022 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# === This BUILD file is auto-generated, modify the GnBuildGenerator task instead of editing this file manually. ===
+
+import("//build_overrides/chip.gni")
+import("${chip_root}/build/chip/java/rules.gni")
+
+java_prebuilt("annotation") {
+  jar_path = "artifacts/jsr305-3.0.2.jar"
+}

third_party/java_deps/set_up_java_deps.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+#
+#    Copyright (c) 2022 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+mkdir third_party/java_deps/artifacts
+curl --fail --location --silent --show-error https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar -o third_party/java_deps/artifacts/jsr305-3.0.2.jar