Move kotlin lib onboardingpayload to package matter (project-chip#29623)

* Move kotlin lib onboardingpayload to package matter * Restyled by google-java-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
jmeg-sfy · Oct 16, 2023 · a9d7401 · a9d7401
1 parent e6f0134
commit a9d7401
Show file tree

Hide file tree

Showing 26 changed files with 96 additions and 96 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/...android/App/platform-app/src/main/java/com/matter/tv/server/fragments/QrCodeFragment.java b/...android/App/platform-app/src/main/java/com/matter/tv/server/fragments/QrCodeFragment.java
@@ -9,14 +9,14 @@
 import android.widget.SeekBar;
 import android.widget.TextView;
 import androidx.fragment.app.Fragment;
-import chip.onboardingpayload.DiscoveryCapability;
-import chip.onboardingpayload.OnboardingPayload;
-import chip.onboardingpayload.OnboardingPayloadException;
-import chip.onboardingpayload.OnboardingPayloadParser;
 import com.matter.tv.server.QRUtils;
 import com.matter.tv.server.R;
 import com.matter.tv.server.service.MatterServant;
 import java.util.HashSet;
+import matter.onboardingpayload.DiscoveryCapability;
+import matter.onboardingpayload.OnboardingPayload;
+import matter.onboardingpayload.OnboardingPayloadException;
+import matter.onboardingpayload.OnboardingPayloadParser;
 
 /**
  * A simple {@link Fragment} subclass. Use the {@link QrCodeFragment#newInstance} factory method to

diff --git a/...roid/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/MatterApi.kt b/...roid/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/MatterApi.kt
@@ -1,11 +1,11 @@
 package com.matter.virtual.device.app.core.matter
 
-import chip.onboardingpayload.OnboardingPayloadException
-import chip.onboardingpayload.OnboardingPayloadParser
 import com.matter.virtual.device.app.core.matter.model.asSetupPayload
 import com.matter.virtual.device.app.core.model.Payload
 import javax.inject.Inject
 import javax.inject.Singleton
+import matter.onboardingpayload.OnboardingPayloadException
+import matter.onboardingpayload.OnboardingPayloadParser
 import timber.log.Timber
 
 @Singleton

diff --git a/.../App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/model/Payload.kt b/.../App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/model/Payload.kt
@@ -1,10 +1,10 @@
 package com.matter.virtual.device.app.core.matter.model
 
-import chip.onboardingpayload.DiscoveryCapability
-import chip.onboardingpayload.OnboardingPayload
 import com.matter.virtual.device.app.core.common.MatterConstants
 import com.matter.virtual.device.app.core.model.OnboardingType
 import com.matter.virtual.device.app.core.model.Payload
+import matter.onboardingpayload.DiscoveryCapability
+import matter.onboardingpayload.OnboardingPayload
 import timber.log.Timber
 
 fun Payload.asSetupPayload(): OnboardingPayload {