Move kotlin lib onboardingpayload to package matter

project-chip · Oct 6, 2023 · b444a39 · b444a39
1 parent f4c2094
commit b444a39
Show file tree

Hide file tree

Showing 23 changed files with 88 additions and 88 deletions.
diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml
@@ -79,8 +79,8 @@ jobs:
                    chip.tlv.TlvReadWriteTest        \
                    chip.tlv.TlvReaderTest           \
                    chip.jsontlv.JsonToTlvToJsonTest \
-                   chip.onboardingpayload.ManualCodeTest \
-                   chip.onboardingpayload.QRCodeTest
+                   matter.onboardingpayload.ManualCodeTest \
+                   matter.onboardingpayload.QRCodeTest
             - name: Build Java Matter Controller and all clusters app
               run: |
                   scripts/run_in_build_env.sh './scripts/build_python.sh --install_virtual_env out/venv'

diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt
@@ -28,9 +28,6 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import chip.onboardingpayload.OnboardingPayload
-import chip.onboardingpayload.OnboardingPayloadParser
-import chip.onboardingpayload.UnrecognizedQrCodeException
 import com.google.chip.chiptool.provisioning.AddressCommissioningFragment
 import com.google.chip.chiptool.provisioning.DeviceProvisioningFragment
 import com.google.chip.chiptool.provisioning.EnterNetworkFragment
@@ -40,6 +37,9 @@ import com.google.chip.chiptool.setuppayloadscanner.CHIPDeviceDetailsFragment
 import com.google.chip.chiptool.setuppayloadscanner.CHIPDeviceInfo
 import com.google.chip.chiptool.setuppayloadscanner.CHIPLedgerDetailsFragment
 import com.google.chip.chiptool.util.DeviceIdUtil
+import matter.onboardingpayload.OnboardingPayload
+import matter.onboardingpayload.OnboardingPayloadParser
+import matter.onboardingpayload.UnrecognizedQrCodeException
 import org.json.JSONObject
 
 class CHIPToolActivity :

diff --git a/...HIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/BarcodeFragment.kt b/...HIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/BarcodeFragment.kt
@@ -36,8 +36,6 @@ import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.checkSelfPermission
 import androidx.fragment.app.Fragment
-import chip.onboardingpayload.OnboardingPayloadParser
-import chip.onboardingpayload.UnrecognizedQrCodeException
 import com.google.chip.chiptool.R
 import com.google.chip.chiptool.SelectActionFragment
 import com.google.chip.chiptool.databinding.BarcodeFragmentBinding
@@ -50,6 +48,8 @@ import java.util.concurrent.Executors
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
+import matter.onboardingpayload.OnboardingPayloadParser
+import matter.onboardingpayload.UnrecognizedQrCodeException
 
 /** Launches the camera to scan for QR code. */
 class BarcodeFragment : Fragment() {

diff --git a/...CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceInfo.kt b/...CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceInfo.kt
@@ -19,9 +19,9 @@
 package com.google.chip.chiptool.setuppayloadscanner
 
 import android.os.Parcelable
-import chip.onboardingpayload.DiscoveryCapability
-import chip.onboardingpayload.OnboardingPayload
 import kotlinx.parcelize.Parcelize
+import matter.onboardingpayload.DiscoveryCapability
+import matter.onboardingpayload.OnboardingPayload
 
 /** Class to hold the CHIP device information. */
 @Parcelize

diff --git a/...oid/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/QrCodeInfo.kt b/...oid/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/QrCodeInfo.kt
@@ -1,8 +1,8 @@
 package com.google.chip.chiptool.setuppayloadscanner
 
 import android.os.Parcelable
-import chip.onboardingpayload.OptionalQRCodeInfoType
 import kotlinx.parcelize.Parcelize
+import matter.onboardingpayload.OptionalQRCodeInfoType
 
 @Parcelize
 data class QrCodeInfo(

diff --git a/kotlin-detect-config.yaml b/kotlin-detect-config.yaml
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
@@ -272,20 +272,20 @@ kotlin_library("onboarding_payload") {
   deps = [ ":tlv" ]
 
   sources = [
-    "src/chip/onboardingpayload/Base38.kt",
-    "src/chip/onboardingpayload/CommissioningFlow.kt",
-    "src/chip/onboardingpayload/DiscoveryCapability.kt",
-    "src/chip/onboardingpayload/ManualOnboardingPayloadGenerator.kt",
-    "src/chip/onboardingpayload/ManualOnboardingPayloadParser.kt",
-    "src/chip/onboardingpayload/OnboardingPayload.kt",
-    "src/chip/onboardingpayload/OnboardingPayloadParser.kt",
-    "src/chip/onboardingpayload/OptionalQRCodeInfo.kt",
-    "src/chip/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt",
-    "src/chip/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt",
-    "src/chip/onboardingpayload/QRCodeOnboardingPayloadParser.kt",
-    "src/chip/onboardingpayload/VendorId.kt",
-    "src/chip/onboardingpayload/Verhoeff.kt",
-    "src/chip/onboardingpayload/Verhoeff10.kt",
+    "src/matter/onboardingpayload/Base38.kt",
+    "src/matter/onboardingpayload/CommissioningFlow.kt",
+    "src/matter/onboardingpayload/DiscoveryCapability.kt",
+    "src/matter/onboardingpayload/ManualOnboardingPayloadGenerator.kt",
+    "src/matter/onboardingpayload/ManualOnboardingPayloadParser.kt",
+    "src/matter/onboardingpayload/OnboardingPayload.kt",
+    "src/matter/onboardingpayload/OnboardingPayloadParser.kt",
+    "src/matter/onboardingpayload/OptionalQRCodeInfo.kt",
+    "src/matter/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt",
+    "src/matter/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt",
+    "src/matter/onboardingpayload/QRCodeOnboardingPayloadParser.kt",
+    "src/matter/onboardingpayload/VendorId.kt",
+    "src/matter/onboardingpayload/Verhoeff.kt",
+    "src/matter/onboardingpayload/Verhoeff10.kt",
   ]
 }
 
@@ -298,7 +298,7 @@ kotlin_library("onboardingpayload_manual_code_test") {
     "${chip_root}/third_party/java_deps:truth",
   ]
 
-  sources = [ "tests/chip/onboardingpayload/ManualCodeTest.kt" ]
+  sources = [ "tests/matter/onboardingpayload/ManualCodeTest.kt" ]
 
   kotlinc_flags = [ "-Xlint:deprecation" ]
 }
@@ -312,7 +312,7 @@ kotlin_library("onboardingpayload_qr_code_test") {
     "${chip_root}/third_party/java_deps:truth",
   ]
 
-  sources = [ "tests/chip/onboardingpayload/QRCodeTest.kt" ]
+  sources = [ "tests/matter/onboardingpayload/QRCodeTest.kt" ]
 
   kotlinc_flags = [ "-Xlint:deprecation" ]
 }

diff --git a/...java/src/chip/onboardingpayload/Base38.kt → ...va/src/matter/onboardingpayload/Base38.kt b/...java/src/chip/onboardingpayload/Base38.kt → ...va/src/matter/onboardingpayload/Base38.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 private val kCodes =
   charArrayOf(

diff --git a/...ip/onboardingpayload/CommissioningFlow.kt → ...er/onboardingpayload/CommissioningFlow.kt b/...ip/onboardingpayload/CommissioningFlow.kt → ...er/onboardingpayload/CommissioningFlow.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 /**
  * Enum values for possible flows for out-of-box commissioning that a Matter device manufacturer may

diff --git a/.../onboardingpayload/DiscoveryCapability.kt → .../onboardingpayload/DiscoveryCapability.kt b/.../onboardingpayload/DiscoveryCapability.kt → .../onboardingpayload/DiscoveryCapability.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 /** Enum values for possible bits in the onboarding paylod's discovery capabilities bitmask. */
 enum class DiscoveryCapability {

diff --git a/...yload/ManualOnboardingPayloadGenerator.kt → ...yload/ManualOnboardingPayloadGenerator.kt b/...yload/ManualOnboardingPayloadGenerator.kt → ...yload/ManualOnboardingPayloadGenerator.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 class ManualOnboardingPayloadGenerator(private val payloadContents: OnboardingPayload) {
   private var skipPayloadValidation = false

diff --git a/...gpayload/ManualOnboardingPayloadParser.kt → ...gpayload/ManualOnboardingPayloadParser.kt b/...gpayload/ManualOnboardingPayloadParser.kt → ...gpayload/ManualOnboardingPayloadParser.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 import java.util.concurrent.atomic.AtomicInteger
 

diff --git a/...ip/onboardingpayload/OnboardingPayload.kt → ...er/onboardingpayload/OnboardingPayload.kt b/...ip/onboardingpayload/OnboardingPayload.kt → ...er/onboardingpayload/OnboardingPayload.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 // See section 5.1.2. QR Code in the Matter specification
 const val kDiscriminatorLongBits = 12

diff --git a/...oardingpayload/OnboardingPayloadParser.kt → ...oardingpayload/OnboardingPayloadParser.kt b/...oardingpayload/OnboardingPayloadParser.kt → ...oardingpayload/OnboardingPayloadParser.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 /** Parser for scanned QR code or Manual Pairing Code. */
 class OnboardingPayloadParser {

diff --git a/...p/onboardingpayload/OptionalQRCodeInfo.kt → ...r/onboardingpayload/OptionalQRCodeInfo.kt b/...p/onboardingpayload/OptionalQRCodeInfo.kt → ...r/onboardingpayload/OptionalQRCodeInfo.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 enum class OptionalQRCodeInfoType {
   TYPE_UNKNOWN,

diff --git a/.../QRCodeBasicOnboardingPayloadGenerator.kt → .../QRCodeBasicOnboardingPayloadGenerator.kt b/.../QRCodeBasicOnboardingPayloadGenerator.kt → .../QRCodeBasicOnboardingPayloadGenerator.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 import java.util.concurrent.atomic.AtomicInteger
 

diff --git a/...yload/QRCodeOnboardingPayloadGenerator.kt → ...yload/QRCodeOnboardingPayloadGenerator.kt b/...yload/QRCodeOnboardingPayloadGenerator.kt → ...yload/QRCodeOnboardingPayloadGenerator.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 import chip.tlv.AnonymousTag
 import chip.tlv.ContextSpecificTag

diff --git a/...gpayload/QRCodeOnboardingPayloadParser.kt → ...gpayload/QRCodeOnboardingPayloadParser.kt b/...gpayload/QRCodeOnboardingPayloadParser.kt → ...gpayload/QRCodeOnboardingPayloadParser.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 import java.util.concurrent.atomic.AtomicInteger
 

diff --git a/...va/src/chip/onboardingpayload/VendorId.kt → .../src/matter/onboardingpayload/VendorId.kt b/...va/src/chip/onboardingpayload/VendorId.kt → .../src/matter/onboardingpayload/VendorId.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 /**
  * code="0x0000" is defined as "Matter Standard" in the official CSA alliance manufacturer ID

diff --git a/...va/src/chip/onboardingpayload/Verhoeff.kt → .../src/matter/onboardingpayload/Verhoeff.kt b/...va/src/chip/onboardingpayload/Verhoeff.kt → .../src/matter/onboardingpayload/Verhoeff.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 object Verhoeff {
   fun dihedralMultiply(x: Int, y: Int, n: Int): Int {

diff --git a/.../src/chip/onboardingpayload/Verhoeff10.kt → ...rc/matter/onboardingpayload/Verhoeff10.kt b/.../src/chip/onboardingpayload/Verhoeff10.kt → ...rc/matter/onboardingpayload/Verhoeff10.kt
@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 /** Implements Verhoeff's check-digit algorithm for base-10 strings. */
 class Verhoeff10 {

diff --git a/.../chip/onboardingpayload/ManualCodeTest.kt → ...atter/onboardingpayload/ManualCodeTest.kt b/.../chip/onboardingpayload/ManualCodeTest.kt → ...atter/onboardingpayload/ManualCodeTest.kt
@@ -16,7 +16,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 import com.google.common.truth.Truth.assertThat
 import java.util.concurrent.atomic.AtomicInteger

diff --git a/...ests/chip/onboardingpayload/QRCodeTest.kt → ...ts/matter/onboardingpayload/QRCodeTest.kt b/...ests/chip/onboardingpayload/QRCodeTest.kt → ...ts/matter/onboardingpayload/QRCodeTest.kt
@@ -16,7 +16,7 @@
  *    limitations under the License.
  */
 
-package chip.onboardingpayload
+package matter.onboardingpayload
 
 import com.google.common.truth.Truth.assertThat
 import org.junit.Assert.assertEquals