diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 2a3254060422ea..197ecbcb736326 100644 --- 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 index 13f919ec057a9c..2da072a85fa243 100644 --- 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/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/BarcodeFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/BarcodeFragment.kt index 9a9b5a3322eb11..a218c42fb06a8e 100644 --- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/BarcodeFragment.kt +++ b/examples/android/CHIPTool/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/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceInfo.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceInfo.kt index 57623908739819..cbeb3746665b6f 100644 --- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceInfo.kt +++ b/examples/android/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/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/QrCodeInfo.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/QrCodeInfo.kt index 7db2c591cc56a8..3524dc8e08cbb2 100644 --- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/QrCodeInfo.kt +++ b/examples/android/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/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/QrCodeFragment.java b/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/QrCodeFragment.java index abd660bb8a57f1..0877a57e965c80 100644 --- a/examples/tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/fragments/QrCodeFragment.java +++ b/examples/tv-app/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/examples/virtual-device-app/android/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/MatterApi.kt b/examples/virtual-device-app/android/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/MatterApi.kt index 16974b4e307b49..51e5c796e3568d 100644 --- a/examples/virtual-device-app/android/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/MatterApi.kt +++ b/examples/virtual-device-app/android/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/examples/virtual-device-app/android/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/model/Payload.kt b/examples/virtual-device-app/android/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/model/Payload.kt index 076fd5c7e86815..2f36c5a8e01bed 100644 --- a/examples/virtual-device-app/android/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/model/Payload.kt +++ b/examples/virtual-device-app/android/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 { diff --git a/kotlin-detect-config.yaml b/kotlin-detect-config.yaml index d1e3b160e15974..0897a024fe9585 100644 --- a/kotlin-detect-config.yaml +++ b/kotlin-detect-config.yaml @@ -24,13 +24,13 @@ style: - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt" - "**/examples/java-matter-controller/java/src/com/matter/controller/Main.kt" - "**/src/controller/java/src/chip/jsontlv/JsonToTlv.kt" - - "**/src/controller/java/src/chip/onboardingpayload/Base38.kt" - - "**/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadParser.kt" - - "**/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt" - - "**/src/controller/java/src/chip/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt" - - "**/src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt" - - "**/src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadParser.kt" - - "**/src/controller/java/src/chip/onboardingpayload/VendorId.kt" + - "**/src/controller/java/src/matter/onboardingpayload/Base38.kt" + - "**/src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadParser.kt" + - "**/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt" + - "**/src/controller/java/src/matter/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt" + - "**/src/controller/java/src/matter/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt" + - "**/src/controller/java/src/matter/onboardingpayload/QRCodeOnboardingPayloadParser.kt" + - "**/src/controller/java/src/matter/onboardingpayload/VendorId.kt" - "**/src/controller/java/src/chip/tlv/tags.kt" - "**/src/controller/java/src/chip/tlv/TlvWriter.kt" - "**/src/controller/java/src/chip/tlv/types.kt" @@ -41,8 +41,8 @@ style: - "**/src/controller/java/tests/chip/devicecontroller/cluster/ChipClusterEventStructTest.kt" - "**/src/controller/java/tests/chip/devicecontroller/cluster/ChipClusterStructTest.kt" - "**/src/controller/java/tests/chip/jsontlv/JsonToTlvToJsonTest.kt" - - "**/src/controller/java/tests/chip/onboardingpayload/ManualCodeTest.kt" - - "**/src/controller/java/tests/chip/onboardingpayload/QRCodeTest.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/ManualCodeTest.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/QRCodeTest.kt" - "**/src/controller/java/tests/chip/tlv/TlvReaderTest.kt" - "**/src/controller/java/tests/chip/tlv/TlvReadWriteTest.kt" - "**/src/controller/java/tests/chip/tlv/TlvWriterTest.kt" @@ -107,7 +107,7 @@ style: - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkShortCommand.kt" - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkVendorCommand.kt" - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/UnpairCommand.kt" - - "**/src/controller/java/src/chip/onboardingpayload/Verhoeff.kt" + - "**/src/controller/java/src/matter/onboardingpayload/Verhoeff.kt" MaxLineLength: excludes: - "**/examples/android/CHIPTest/app/src/main/java/com/tcl/chip/chiptest/MainActivity.kt" @@ -128,12 +128,12 @@ style: - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt" - "**/src/controller/java/generated/java/**/*" - "**/src/controller/java/src/chip/jsontlv/TlvToJson.kt" - - "**/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadGenerator.kt" - - "**/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadParser.kt" - - "**/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt" - - "**/src/controller/java/src/chip/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt" - - "**/src/controller/java/tests/chip/onboardingpayload/ManualCodeTest.kt" - - "**/src/controller/java/tests/chip/onboardingpayload/QRCodeTest.kt" + - "**/src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadGenerator.kt" + - "**/src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadParser.kt" + - "**/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt" + - "**/src/controller/java/src/matter/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/ManualCodeTest.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/QRCodeTest.kt" UnusedParameter: excludes: - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/bluetooth/BluetoothManager.kt" @@ -145,8 +145,8 @@ style: - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/EnterNetworkFragment.kt" - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.kt" - "**/src/controller/java/generated/java/**/*" - - "**/src/controller/java/src/chip/onboardingpayload/Verhoeff.kt" - - "**/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt" + - "**/src/controller/java/src/matter/onboardingpayload/Verhoeff.kt" + - "**/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt" UnusedPrivateProperty: excludes: - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt" @@ -154,13 +154,13 @@ style: - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt" - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/EnterNetworkFragment.kt" - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/common/MatterCommand.kt" - - "**/src/controller/java/src/chip/onboardingpayload/Base38.kt" + - "**/src/controller/java/src/matter/onboardingpayload/Base38.kt" ForbiddenComment: excludes: - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/MultiAdminClientFragment.kt" - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt" - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/AddressCommissioningFragment.kt" - - "**/src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadParser.kt" + - "**/src/controller/java/src/matter/onboardingpayload/QRCodeOnboardingPayloadParser.kt" ExplicitItLambdaParameter: excludes: - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt" @@ -172,9 +172,9 @@ style: - "**/src/controller/java/src/chip/tlv/TlvReader.kt" - "**/src/controller/java/src/chip/jsontlv/JsonToTlv.kt" - "**/src/controller/java/src/chip/jsontlv/TlvToJson.kt" - - "**/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadParser.kt" - - "**/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadGenerator.kt" - - "**/src/controller/java/src/chip/onboardingpayload/Base38.kt" + - "**/src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadParser.kt" + - "**/src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadGenerator.kt" + - "**/src/controller/java/src/matter/onboardingpayload/Base38.kt" SerialVersionUIDInSerializableClass: excludes: - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/HistoryCommand.kt" @@ -182,7 +182,7 @@ style: excludes: - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/BarcodeFragment.kt" - "**/src/controller/java/generated/java/**/*" - - "**/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt" + - "**/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt" UseCheckOrError: excludes: - "**/src/controller/java/generated/java/**/*" @@ -192,18 +192,18 @@ style: excludes: - "**/src/controller/java/generated/java/**/*" - "**/src/controller/java/src/chip/jsontlv/JsonToTlv.kt" - - "**/src/controller/java/src/chip/onboardingpayload/Verhoeff10.kt" + - "**/src/controller/java/src/matter/onboardingpayload/Verhoeff10.kt" UtilityClassWithPublicConstructor: excludes: - - "**/src/controller/java/src/chip/onboardingpayload/Verhoeff.kt" + - "**/src/controller/java/src/matter/onboardingpayload/Verhoeff.kt" MayBeConst: excludes: - "**/src/controller/java/generated/java/**/*" - - "**/src/controller/java/src/chip/onboardingpayload/Base38.kt" + - "**/src/controller/java/src/matter/onboardingpayload/Base38.kt" FunctionOnlyReturningConstant: excludes: - "**/src/controller/java/generated/java/**/*" - - "**/src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt" + - "**/src/controller/java/src/matter/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt" exceptions: TooGenericExceptionCaught: @@ -215,8 +215,8 @@ exceptions: - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.kt" - "**/examples/java-matter-controller/java/src/com/matter/controller/Main.kt" - "**/src/controller/java/generated/java/**/*" - - "**/src/controller/java/tests/chip/onboardingpayload/ManualCodeTest.kt" - - "**/src/controller/java/tests/chip/onboardingpayload/QRCodeTest.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/ManualCodeTest.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/QRCodeTest.kt" SwallowedException: excludes: - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt" @@ -239,8 +239,8 @@ naming: - "**/src/controller/java/tests/chip/tlv/TlvWriterTest.kt" - "**/src/controller/java/tests/chip/tlv/TlvReaderTest.kt" - "**/src/controller/java/tests/chip/jsontlv/JsonToTlvToJsonTest.kt" - - "**/src/controller/java/tests/chip/onboardingpayload/ManualCodeTest.kt" - - "**/src/controller/java/tests/chip/onboardingpayload/QRCodeTest.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/ManualCodeTest.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/QRCodeTest.kt" - "**/examples/android/CHIPTest/app/src/test/java/com/tcl/chip/chiptest/ExampleUnitTest.kt" ConstructorParameterNaming: excludes: @@ -249,7 +249,7 @@ naming: TopLevelPropertyNaming: excludes: - "**/src/controller/java/generated/java/**/*" - - "**/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt" + - "**/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt" performance: SpreadOperator: @@ -261,12 +261,12 @@ potential-bugs: EqualsWithHashCodeExist: excludes: - "**/src/controller/java/generated/java/**/*" - - "**/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt" + - "**/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt" ImplicitDefaultLocale: excludes: - "**/src/controller/java/generated/java/**/*" - - "**/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt" - - "**/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadGenerator.kt" + - "**/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt" + - "**/src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadGenerator.kt" complexity: TooManyFunctions: @@ -286,14 +286,14 @@ complexity: - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt" - "**/src/controller/java/generated/java/**/*" - "**/src/controller/java/src/chip/jsontlv/JsonToTlv.kt" - - "**/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt" + - "**/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt" - "**/src/controller/java/src/chip/tlv/TlvReader.kt" - "**/src/controller/java/src/chip/tlv/TlvWriter.kt" - "**/src/controller/java/src/matter/controller/MatterControllerImpl.kt" - "**/src/controller/java/src/matter/controller/CompletionListenerAdapter.kt" - "**/src/controller/java/tests/chip/jsontlv/JsonToTlvToJsonTest.kt" - - "**/src/controller/java/tests/chip/onboardingpayload/ManualCodeTest.kt" - - "**/src/controller/java/tests/chip/onboardingpayload/QRCodeTest.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/ManualCodeTest.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/QRCodeTest.kt" - "**/src/controller/java/tests/chip/tlv/TlvReadWriteTest.kt" NestedBlockDepth: excludes: @@ -304,18 +304,18 @@ complexity: - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt" - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Command.kt" - "**/src/controller/java/generated/java/**/*" - - "**/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt" + - "**/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt" LongMethod: excludes: - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/AddressCommissioningFragment.kt" - "**/examples/java-matter-controller/java/src/com/matter/controller/commands/common/CommandManager.kt" - "**/src/controller/java/generated/java/**/*" - - "**/src/controller/java/src/chip/onboardingpayload/Base38.kt" - - "**/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadGenerator.kt" - - "**/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadParser.kt" + - "**/src/controller/java/src/matter/onboardingpayload/Base38.kt" + - "**/src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadGenerator.kt" + - "**/src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadParser.kt" - "**/src/controller/java/tests/chip/jsontlv/JsonToTlvToJsonTest.kt" - - "**/src/controller/java/tests/chip/onboardingpayload/ManualCodeTest.kt" - - "**/src/controller/java/tests/chip/onboardingpayload/QRCodeTest.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/ManualCodeTest.kt" + - "**/src/controller/java/tests/matter/onboardingpayload/QRCodeTest.kt" - "**/src/controller/java/tests/chip/tlv/TlvReaderTest.kt" LargeClass: excludes: @@ -331,7 +331,7 @@ complexity: ComplexCondition: excludes: - "**/src/controller/java/generated/java/**/*" - - "**/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadGenerator.kt" + - "**/src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadGenerator.kt" empty-blocks: EmptyFunctionBlock: diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn index e7e4a949309a18..530f481aa5d37b 100644 --- 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/src/controller/java/src/chip/onboardingpayload/Base38.kt b/src/controller/java/src/matter/onboardingpayload/Base38.kt similarity index 99% rename from src/controller/java/src/chip/onboardingpayload/Base38.kt rename to src/controller/java/src/matter/onboardingpayload/Base38.kt index 1670f929ed1f4b..6c48261916a176 100644 --- a/src/controller/java/src/chip/onboardingpayload/Base38.kt +++ b/src/controller/java/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/src/controller/java/src/chip/onboardingpayload/CommissioningFlow.kt b/src/controller/java/src/matter/onboardingpayload/CommissioningFlow.kt similarity index 97% rename from src/controller/java/src/chip/onboardingpayload/CommissioningFlow.kt rename to src/controller/java/src/matter/onboardingpayload/CommissioningFlow.kt index 4b474261972cc0..7b21d074ab23b6 100644 --- a/src/controller/java/src/chip/onboardingpayload/CommissioningFlow.kt +++ b/src/controller/java/src/matter/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/src/controller/java/src/chip/onboardingpayload/DiscoveryCapability.kt b/src/controller/java/src/matter/onboardingpayload/DiscoveryCapability.kt similarity index 96% rename from src/controller/java/src/chip/onboardingpayload/DiscoveryCapability.kt rename to src/controller/java/src/matter/onboardingpayload/DiscoveryCapability.kt index 1d799292716bfc..571ffbdc96f765 100644 --- a/src/controller/java/src/chip/onboardingpayload/DiscoveryCapability.kt +++ b/src/controller/java/src/matter/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/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadGenerator.kt b/src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadGenerator.kt similarity index 99% rename from src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadGenerator.kt rename to src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadGenerator.kt index 0fbd55c1cbebd4..d47e6ffc0c068b 100644 --- a/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadGenerator.kt +++ b/src/controller/java/src/matter/onboardingpayload/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/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadParser.kt b/src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadParser.kt similarity index 99% rename from src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadParser.kt rename to src/controller/java/src/matter/onboardingpayload/ManualOnboardingPayloadParser.kt index 3e2bac7be7d287..e67d469fcdceb7 100644 --- a/src/controller/java/src/chip/onboardingpayload/ManualOnboardingPayloadParser.kt +++ b/src/controller/java/src/matter/onboardingpayload/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/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt b/src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt similarity index 99% rename from src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt rename to src/controller/java/src/matter/onboardingpayload/OnboardingPayload.kt index 4d7cd01ff4a4d6..6eb71d166e053a 100644 --- a/src/controller/java/src/chip/onboardingpayload/OnboardingPayload.kt +++ b/src/controller/java/src/matter/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/src/controller/java/src/chip/onboardingpayload/OnboardingPayloadParser.kt b/src/controller/java/src/matter/onboardingpayload/OnboardingPayloadParser.kt similarity index 99% rename from src/controller/java/src/chip/onboardingpayload/OnboardingPayloadParser.kt rename to src/controller/java/src/matter/onboardingpayload/OnboardingPayloadParser.kt index cef151816f9d6c..21a2493df4d499 100644 --- a/src/controller/java/src/chip/onboardingpayload/OnboardingPayloadParser.kt +++ b/src/controller/java/src/matter/onboardingpayload/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/src/controller/java/src/chip/onboardingpayload/OptionalQRCodeInfo.kt b/src/controller/java/src/matter/onboardingpayload/OptionalQRCodeInfo.kt similarity index 97% rename from src/controller/java/src/chip/onboardingpayload/OptionalQRCodeInfo.kt rename to src/controller/java/src/matter/onboardingpayload/OptionalQRCodeInfo.kt index f70c7ccc5ddcc7..4bd203f9f5d14f 100644 --- a/src/controller/java/src/chip/onboardingpayload/OptionalQRCodeInfo.kt +++ b/src/controller/java/src/matter/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/src/controller/java/src/chip/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt b/src/controller/java/src/matter/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt similarity index 99% rename from src/controller/java/src/chip/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt rename to src/controller/java/src/matter/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt index 5560270b09c19d..a51fd8367be335 100644 --- a/src/controller/java/src/chip/onboardingpayload/QRCodeBasicOnboardingPayloadGenerator.kt +++ b/src/controller/java/src/matter/onboardingpayload/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/src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt b/src/controller/java/src/matter/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt similarity index 99% rename from src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt rename to src/controller/java/src/matter/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt index 46dc6c8d37df3a..0df0b412c08eba 100644 --- a/src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadGenerator.kt +++ b/src/controller/java/src/matter/onboardingpayload/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/src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadParser.kt b/src/controller/java/src/matter/onboardingpayload/QRCodeOnboardingPayloadParser.kt similarity index 99% rename from src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadParser.kt rename to src/controller/java/src/matter/onboardingpayload/QRCodeOnboardingPayloadParser.kt index ef33405114e1ee..88350e343ae072 100644 --- a/src/controller/java/src/chip/onboardingpayload/QRCodeOnboardingPayloadParser.kt +++ b/src/controller/java/src/matter/onboardingpayload/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/src/controller/java/src/chip/onboardingpayload/VendorId.kt b/src/controller/java/src/matter/onboardingpayload/VendorId.kt similarity index 99% rename from src/controller/java/src/chip/onboardingpayload/VendorId.kt rename to src/controller/java/src/matter/onboardingpayload/VendorId.kt index 973f9eb1e87fe2..9a27f38cb0a4bf 100644 --- a/src/controller/java/src/chip/onboardingpayload/VendorId.kt +++ b/src/controller/java/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/src/controller/java/src/chip/onboardingpayload/Verhoeff.kt b/src/controller/java/src/matter/onboardingpayload/Verhoeff.kt similarity index 97% rename from src/controller/java/src/chip/onboardingpayload/Verhoeff.kt rename to src/controller/java/src/matter/onboardingpayload/Verhoeff.kt index 52974e7d32df67..bef456970ce86f 100644 --- a/src/controller/java/src/chip/onboardingpayload/Verhoeff.kt +++ b/src/controller/java/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/controller/java/src/chip/onboardingpayload/Verhoeff10.kt b/src/controller/java/src/matter/onboardingpayload/Verhoeff10.kt similarity index 99% rename from src/controller/java/src/chip/onboardingpayload/Verhoeff10.kt rename to src/controller/java/src/matter/onboardingpayload/Verhoeff10.kt index 91734a21bceec0..936b402a7e3bab 100644 --- a/src/controller/java/src/chip/onboardingpayload/Verhoeff10.kt +++ b/src/controller/java/src/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/src/controller/java/tests/chip/onboardingpayload/ManualCodeTest.kt b/src/controller/java/tests/matter/onboardingpayload/ManualCodeTest.kt similarity index 99% rename from src/controller/java/tests/chip/onboardingpayload/ManualCodeTest.kt rename to src/controller/java/tests/matter/onboardingpayload/ManualCodeTest.kt index acaf7e8d4758b9..900a3eb1a7ff72 100644 --- a/src/controller/java/tests/chip/onboardingpayload/ManualCodeTest.kt +++ b/src/controller/java/tests/matter/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/src/controller/java/tests/chip/onboardingpayload/QRCodeTest.kt b/src/controller/java/tests/matter/onboardingpayload/QRCodeTest.kt similarity index 99% rename from src/controller/java/tests/chip/onboardingpayload/QRCodeTest.kt rename to src/controller/java/tests/matter/onboardingpayload/QRCodeTest.kt index 92ad1bf8c55909..b97725c5c3946f 100644 --- a/src/controller/java/tests/chip/onboardingpayload/QRCodeTest.kt +++ b/src/controller/java/tests/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