From 393fea153c60faadee06db009a6d2faffa8f5b0b Mon Sep 17 00:00:00 2001 From: Mattia Dal Ben Date: Fri, 23 Jun 2023 15:08:10 +0200 Subject: [PATCH] refactor(nm): move enums into `org.eclipse.kura.nm.enums` package (#4730) * refactor: move NetworkManager enums into dedicated package * refactor: change package * fix: forgotten imports * test: fix imports * refactor: move enum test in related package * fix: imports * fix: remove unnecessary imports --- .../org/eclipse/kura/nm/DeviceStateLock.java | 1 + .../nm/NMConfigurationEnforcementHandler.java | 2 ++ .../org/eclipse/kura/nm/NMDbusConnector.java | 4 +++ .../kura/nm/NMDeviceStateChangeHandler.java | 1 + .../eclipse/kura/nm/NMModemResetHandler.java | 1 + .../nm/configuration/NMSettingsConverter.java | 2 +- .../kura/nm/{ => enums}/MMBearerIpFamily.java | 2 +- .../MMModem3gppRegistrationState.java | 2 +- .../{ => enums}/MMModemAccessTechnology.java | 2 +- .../kura/nm/{ => enums}/MMModemBand.java | 2 +- .../nm/{ => enums}/MMModemCapability.java | 2 +- .../nm/{ => enums}/MMModemLocationSource.java | 2 +- .../kura/nm/{ => enums}/MMModemMode.java | 2 +- .../kura/nm/{ => enums}/MMModemPortType.java | 2 +- .../nm/{ => enums}/MMModemPowerState.java | 2 +- .../kura/nm/{ => enums}/MMModemState.java | 2 +- .../kura/nm/{ => enums}/MMSimEsimStatus.java | 2 +- .../kura/nm/{ => enums}/MMSimType.java | 2 +- .../{ => enums}/NM80211ApSecurityFlags.java | 2 +- .../kura/nm/{ => enums}/NM80211Mode.java | 2 +- .../kura/nm/{ => enums}/NMDeviceState.java | 2 +- .../nm/{ => enums}/NMDeviceStateReason.java | 2 +- .../kura/nm/{ => enums}/NMDeviceType.java | 2 +- .../{ => enums}/NMDeviceWifiCapabilities.java | 2 +- .../nm/status/DevicePropertiesWrapper.java | 2 +- .../kura/nm/status/NMStatusConverter.java | 32 +++++++++---------- .../eclipse/kura/nm/NMDbusConnectorTest.java | 3 ++ .../kura/nm/NMModemResetHandlerTest.java | 2 ++ .../NMSettingsConverterTest.java | 2 +- .../nm/{ => enums}/MMBearerIpFamilyTest.java | 2 +- .../MMModem3gppRegistrationStateTest.java | 2 +- .../MMModemAccessTechnologyTest.java | 2 +- .../kura/nm/{ => enums}/MMModemBandTest.java | 2 +- .../nm/{ => enums}/MMModemCapabilityTest.java | 2 +- .../MMModemLocationSourceTest.java | 2 +- .../kura/nm/{ => enums}/MMModemModeTest.java | 2 +- .../kura/nm/{ => enums}/MMModemPortTest.java | 2 +- .../nm/{ => enums}/MMModemPowerStateTest.java | 2 +- .../nm/{ => enums}/MMSimESimStatusTest.java | 2 +- .../kura/nm/{ => enums}/MMSimTypeTest.java | 2 +- .../NM80211ApSecurityFlagsTest.java | 2 +- .../kura/nm/{ => enums}/NM80211ModeTest.java | 2 +- .../{ => enums}/NMDeviceStateReasonTest.java | 2 +- .../nm/{ => enums}/NMDeviceStateTest.java | 2 +- .../kura/nm/{ => enums}/NMDeviceTypeTest.java | 2 +- .../NMDeviceWifiCapabilitiesTest.java | 2 +- 46 files changed, 68 insertions(+), 54 deletions(-) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMBearerIpFamily.java (98%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMModem3gppRegistrationState.java (99%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMModemAccessTechnology.java (99%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMModemBand.java (99%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMModemCapability.java (99%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMModemLocationSource.java (98%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMModemMode.java (98%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMModemPortType.java (98%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMModemPowerState.java (98%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMModemState.java (98%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMSimEsimStatus.java (98%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/MMSimType.java (97%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/NM80211ApSecurityFlags.java (98%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/NM80211Mode.java (97%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/NMDeviceState.java (99%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/NMDeviceStateReason.java (99%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/NMDeviceType.java (99%) rename kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/{ => enums}/NMDeviceWifiCapabilities.java (98%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/MMBearerIpFamilyTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/MMModem3gppRegistrationStateTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/MMModemAccessTechnologyTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/MMModemBandTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/MMModemCapabilityTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/MMModemLocationSourceTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/MMModemModeTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/MMModemPortTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/MMModemPowerStateTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/MMSimESimStatusTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/MMSimTypeTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/NM80211ApSecurityFlagsTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/NM80211ModeTest.java (98%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/NMDeviceStateReasonTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/NMDeviceStateTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/NMDeviceTypeTest.java (99%) rename kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/{ => enums}/NMDeviceWifiCapabilitiesTest.java (99%) diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/DeviceStateLock.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/DeviceStateLock.java index cec858ae45d..ff1a2bae883 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/DeviceStateLock.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/DeviceStateLock.java @@ -16,6 +16,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.eclipse.kura.nm.enums.NMDeviceState; import org.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.networkmanager.Device; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMConfigurationEnforcementHandler.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMConfigurationEnforcementHandler.java index 3198380a3ed..2a38f5dd037 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMConfigurationEnforcementHandler.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMConfigurationEnforcementHandler.java @@ -14,6 +14,8 @@ import java.util.Objects; +import org.eclipse.kura.nm.enums.NMDeviceState; +import org.eclipse.kura.nm.enums.NMDeviceStateReason; import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.interfaces.DBusSigHandler; import org.freedesktop.networkmanager.Device; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java index f4d658ccca8..53d75cab940 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java @@ -31,6 +31,10 @@ import org.eclipse.kura.net.status.NetworkInterfaceStatus; import org.eclipse.kura.net.wifi.WifiChannel; import org.eclipse.kura.nm.configuration.NMSettingsConverter; +import org.eclipse.kura.nm.enums.MMModemLocationSource; +import org.eclipse.kura.nm.enums.MMModemState; +import org.eclipse.kura.nm.enums.NMDeviceState; +import org.eclipse.kura.nm.enums.NMDeviceType; import org.eclipse.kura.nm.status.AccessPointsProperties; import org.eclipse.kura.nm.status.DevicePropertiesWrapper; import org.eclipse.kura.nm.status.NMStatusConverter; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceStateChangeHandler.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceStateChangeHandler.java index a2b4fb6e9cd..36435cec7ff 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceStateChangeHandler.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceStateChangeHandler.java @@ -14,6 +14,7 @@ import java.util.concurrent.CountDownLatch; +import org.eclipse.kura.nm.enums.NMDeviceState; import org.freedesktop.dbus.interfaces.DBusSigHandler; import org.freedesktop.networkmanager.Device; import org.slf4j.Logger; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMModemResetHandler.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMModemResetHandler.java index c40475ea185..68460d236f1 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMModemResetHandler.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMModemResetHandler.java @@ -15,6 +15,7 @@ import java.util.Objects; import java.util.Timer; +import org.eclipse.kura.nm.enums.NMDeviceState; import org.freedesktop.dbus.interfaces.DBusSigHandler; import org.freedesktop.modemmanager1.Modem; import org.freedesktop.networkmanager.Device; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/configuration/NMSettingsConverter.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/configuration/NMSettingsConverter.java index 7d3f131d7b9..436d6f92217 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/configuration/NMSettingsConverter.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/configuration/NMSettingsConverter.java @@ -24,8 +24,8 @@ import org.eclipse.kura.configuration.Password; import org.eclipse.kura.nm.KuraIpStatus; -import org.eclipse.kura.nm.NMDeviceType; import org.eclipse.kura.nm.NetworkProperties; +import org.eclipse.kura.nm.enums.NMDeviceType; import org.freedesktop.dbus.types.UInt32; import org.freedesktop.dbus.types.Variant; import org.freedesktop.networkmanager.settings.Connection; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMBearerIpFamily.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMBearerIpFamily.java similarity index 98% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMBearerIpFamily.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMBearerIpFamily.java index 167f05d7c77..779d70c6c00 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMBearerIpFamily.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMBearerIpFamily.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import java.util.EnumSet; import java.util.Set; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModem3gppRegistrationState.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModem3gppRegistrationState.java similarity index 99% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModem3gppRegistrationState.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModem3gppRegistrationState.java index 9202f8c9479..7f32d8fd9ba 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModem3gppRegistrationState.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModem3gppRegistrationState.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import org.eclipse.kura.net.status.modem.RegistrationStatus; import org.freedesktop.dbus.types.UInt32; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemAccessTechnology.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemAccessTechnology.java similarity index 99% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemAccessTechnology.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemAccessTechnology.java index 1cfbe55e514..c3af6628faf 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemAccessTechnology.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemAccessTechnology.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import java.util.EnumSet; import java.util.Set; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemBand.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemBand.java similarity index 99% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemBand.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemBand.java index 3c58db9d4e9..8e61a2867cb 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemBand.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemBand.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import org.eclipse.kura.net.status.modem.ModemBand; import org.freedesktop.dbus.types.UInt32; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemCapability.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemCapability.java similarity index 99% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemCapability.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemCapability.java index dcae6027ddf..79c420a36d4 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemCapability.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemCapability.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import java.util.EnumSet; import java.util.Set; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemLocationSource.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemLocationSource.java similarity index 98% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemLocationSource.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemLocationSource.java index 8b0a3316680..e303e29a911 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemLocationSource.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemLocationSource.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import java.util.EnumSet; import java.util.Set; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemMode.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemMode.java similarity index 98% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemMode.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemMode.java index cedd45dcf71..db768c09594 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemMode.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemMode.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import java.util.EnumSet; import java.util.Set; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemPortType.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemPortType.java similarity index 98% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemPortType.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemPortType.java index 87591a4d241..188eab4d9b7 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemPortType.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemPortType.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import org.eclipse.kura.net.status.modem.ModemPortType; import org.freedesktop.dbus.types.UInt32; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemPowerState.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemPowerState.java similarity index 98% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemPowerState.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemPowerState.java index 840f621a5d4..a8654299813 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemPowerState.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemPowerState.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import org.eclipse.kura.net.status.modem.ModemPowerState; import org.freedesktop.dbus.types.UInt32; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemState.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemState.java similarity index 98% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemState.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemState.java index a7490ca1660..5d2e8c107d0 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMModemState.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMModemState.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import org.eclipse.kura.net.status.modem.ModemConnectionStatus; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMSimEsimStatus.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMSimEsimStatus.java similarity index 98% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMSimEsimStatus.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMSimEsimStatus.java index c77ea98b142..4833564e8d5 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMSimEsimStatus.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMSimEsimStatus.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import org.eclipse.kura.net.status.modem.ESimStatus; import org.freedesktop.dbus.types.UInt32; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMSimType.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMSimType.java similarity index 97% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMSimType.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMSimType.java index 5a30e61be71..dfcbd178cc3 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/MMSimType.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/MMSimType.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import org.eclipse.kura.net.status.modem.SimType; import org.freedesktop.dbus.types.UInt32; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NM80211ApSecurityFlags.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NM80211ApSecurityFlags.java similarity index 98% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NM80211ApSecurityFlags.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NM80211ApSecurityFlags.java index ff22026fdd5..cf6971abf7e 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NM80211ApSecurityFlags.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NM80211ApSecurityFlags.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import java.util.ArrayList; import java.util.Arrays; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NM80211Mode.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NM80211Mode.java similarity index 97% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NM80211Mode.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NM80211Mode.java index e977ac97809..d7f0ab06526 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NM80211Mode.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NM80211Mode.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import org.freedesktop.dbus.types.UInt32; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceState.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceState.java similarity index 99% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceState.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceState.java index c6581667bbd..9e64eed5d01 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceState.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceState.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import java.util.Arrays; import java.util.List; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceStateReason.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceStateReason.java similarity index 99% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceStateReason.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceStateReason.java index f4a6180862f..a0b7ea40ad9 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceStateReason.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceStateReason.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import org.freedesktop.dbus.types.UInt32; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceType.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceType.java similarity index 99% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceType.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceType.java index f0fc5ec151c..9473edf7728 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceType.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceType.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import org.freedesktop.dbus.types.UInt32; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceWifiCapabilities.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceWifiCapabilities.java similarity index 98% rename from kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceWifiCapabilities.java rename to kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceWifiCapabilities.java index 38f0340a469..2e621733da2 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDeviceWifiCapabilities.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/enums/NMDeviceWifiCapabilities.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import java.util.ArrayList; import java.util.Arrays; diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/status/DevicePropertiesWrapper.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/status/DevicePropertiesWrapper.java index e0d222c84fa..52d8d91c87d 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/status/DevicePropertiesWrapper.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/status/DevicePropertiesWrapper.java @@ -14,7 +14,7 @@ import java.util.Optional; -import org.eclipse.kura.nm.NMDeviceType; +import org.eclipse.kura.nm.enums.NMDeviceType; import org.freedesktop.dbus.interfaces.Properties; public class DevicePropertiesWrapper { diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/status/NMStatusConverter.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/status/NMStatusConverter.java index 2f1c0076c30..59016eaf166 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/status/NMStatusConverter.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/status/NMStatusConverter.java @@ -57,22 +57,22 @@ import org.eclipse.kura.net.status.wifi.WifiMode; import org.eclipse.kura.net.status.wifi.WifiSecurity; import org.eclipse.kura.net.wifi.WifiChannel; -import org.eclipse.kura.nm.MMBearerIpFamily; -import org.eclipse.kura.nm.MMModem3gppRegistrationState; -import org.eclipse.kura.nm.MMModemAccessTechnology; -import org.eclipse.kura.nm.MMModemBand; -import org.eclipse.kura.nm.MMModemCapability; -import org.eclipse.kura.nm.MMModemLocationSource; -import org.eclipse.kura.nm.MMModemMode; -import org.eclipse.kura.nm.MMModemPortType; -import org.eclipse.kura.nm.MMModemPowerState; -import org.eclipse.kura.nm.MMModemState; -import org.eclipse.kura.nm.MMSimEsimStatus; -import org.eclipse.kura.nm.MMSimType; -import org.eclipse.kura.nm.NM80211ApSecurityFlags; -import org.eclipse.kura.nm.NM80211Mode; -import org.eclipse.kura.nm.NMDeviceState; -import org.eclipse.kura.nm.NMDeviceWifiCapabilities; +import org.eclipse.kura.nm.enums.MMBearerIpFamily; +import org.eclipse.kura.nm.enums.MMModem3gppRegistrationState; +import org.eclipse.kura.nm.enums.MMModemAccessTechnology; +import org.eclipse.kura.nm.enums.MMModemBand; +import org.eclipse.kura.nm.enums.MMModemCapability; +import org.eclipse.kura.nm.enums.MMModemLocationSource; +import org.eclipse.kura.nm.enums.MMModemMode; +import org.eclipse.kura.nm.enums.MMModemPortType; +import org.eclipse.kura.nm.enums.MMModemPowerState; +import org.eclipse.kura.nm.enums.MMModemState; +import org.eclipse.kura.nm.enums.MMSimEsimStatus; +import org.eclipse.kura.nm.enums.MMSimType; +import org.eclipse.kura.nm.enums.NM80211ApSecurityFlags; +import org.eclipse.kura.nm.enums.NM80211Mode; +import org.eclipse.kura.nm.enums.NMDeviceState; +import org.eclipse.kura.nm.enums.NMDeviceWifiCapabilities; import org.freedesktop.dbus.exceptions.DBusExecutionException; import org.freedesktop.dbus.interfaces.Properties; import org.freedesktop.dbus.types.UInt32; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDbusConnectorTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDbusConnectorTest.java index c769984a966..ba85ae39ace 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDbusConnectorTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDbusConnectorTest.java @@ -65,6 +65,9 @@ import org.eclipse.kura.net.status.modem.RegistrationStatus; import org.eclipse.kura.net.status.modem.Sim; import org.eclipse.kura.net.status.modem.SimType; +import org.eclipse.kura.nm.enums.MMModemLocationSource; +import org.eclipse.kura.nm.enums.NMDeviceState; +import org.eclipse.kura.nm.enums.NMDeviceType; import org.freedesktop.ModemManager1; import org.freedesktop.NetworkManager; import org.freedesktop.dbus.DBusPath; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMModemResetHandlerTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMModemResetHandlerTest.java index b73572878c3..bac6fc4a281 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMModemResetHandlerTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMModemResetHandlerTest.java @@ -17,6 +17,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import org.eclipse.kura.nm.enums.NMDeviceState; +import org.eclipse.kura.nm.enums.NMDeviceStateReason; import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.modemmanager1.Modem; import org.freedesktop.networkmanager.Device; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/configuration/NMSettingsConverterTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/configuration/NMSettingsConverterTest.java index 083380b792a..7dcb7b5d00c 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/configuration/NMSettingsConverterTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/configuration/NMSettingsConverterTest.java @@ -26,8 +26,8 @@ import java.util.Optional; import org.eclipse.kura.configuration.Password; -import org.eclipse.kura.nm.NMDeviceType; import org.eclipse.kura.nm.NetworkProperties; +import org.eclipse.kura.nm.enums.NMDeviceType; import org.freedesktop.dbus.types.UInt32; import org.freedesktop.dbus.types.Variant; import org.freedesktop.networkmanager.settings.Connection; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMBearerIpFamilyTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMBearerIpFamilyTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMBearerIpFamilyTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMBearerIpFamilyTest.java index 8c30c407e5f..f0bd9e8c519 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMBearerIpFamilyTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMBearerIpFamilyTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModem3gppRegistrationStateTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModem3gppRegistrationStateTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModem3gppRegistrationStateTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModem3gppRegistrationStateTest.java index 723bda8c00a..d30b6e1b7e1 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModem3gppRegistrationStateTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModem3gppRegistrationStateTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemAccessTechnologyTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemAccessTechnologyTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemAccessTechnologyTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemAccessTechnologyTest.java index 4d54d7610bb..4bcc500bbd2 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemAccessTechnologyTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemAccessTechnologyTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemBandTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemBandTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemBandTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemBandTest.java index 3d77feea0a4..092ce806554 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemBandTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemBandTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemCapabilityTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemCapabilityTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemCapabilityTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemCapabilityTest.java index 00b6ead5cef..01f65d14e86 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemCapabilityTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemCapabilityTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemLocationSourceTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemLocationSourceTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemLocationSourceTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemLocationSourceTest.java index 84e02996db1..bca3d912c65 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemLocationSourceTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemLocationSourceTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemModeTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemModeTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemModeTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemModeTest.java index 65dcb2d62c0..e4253e7cbc4 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemModeTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemModeTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemPortTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemPortTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemPortTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemPortTest.java index 26c509193c2..0317439b355 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemPortTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemPortTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemPowerStateTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemPowerStateTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemPowerStateTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemPowerStateTest.java index 4e65860d1aa..f39f8a0b221 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMModemPowerStateTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMModemPowerStateTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMSimESimStatusTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMSimESimStatusTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMSimESimStatusTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMSimESimStatusTest.java index 8a947c50cf3..ff16dff174b 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMSimESimStatusTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMSimESimStatusTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMSimTypeTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMSimTypeTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMSimTypeTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMSimTypeTest.java index 13dd38c4801..cf6dcf57923 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/MMSimTypeTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/MMSimTypeTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NM80211ApSecurityFlagsTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NM80211ApSecurityFlagsTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NM80211ApSecurityFlagsTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NM80211ApSecurityFlagsTest.java index b71478fcd37..6c71ded90a7 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NM80211ApSecurityFlagsTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NM80211ApSecurityFlagsTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NM80211ModeTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NM80211ModeTest.java similarity index 98% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NM80211ModeTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NM80211ModeTest.java index 0e2a4c7230b..7332b04027a 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NM80211ModeTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NM80211ModeTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceStateReasonTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceStateReasonTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceStateReasonTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceStateReasonTest.java index 808e2d65db5..fa69876ded9 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceStateReasonTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceStateReasonTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceStateTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceStateTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceStateTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceStateTest.java index 0bfeb5fae3b..d73c2d1fdba 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceStateTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceStateTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech ******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceTypeTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceTypeTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceTypeTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceTypeTest.java index b2eddaea984..bac97af5121 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceTypeTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceTypeTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceWifiCapabilitiesTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceWifiCapabilitiesTest.java similarity index 99% rename from kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceWifiCapabilitiesTest.java rename to kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceWifiCapabilitiesTest.java index 43564868a3a..63c69d5e01b 100644 --- a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDeviceWifiCapabilitiesTest.java +++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/enums/NMDeviceWifiCapabilitiesTest.java @@ -10,7 +10,7 @@ * Contributors: * Eurotech *******************************************************************************/ -package org.eclipse.kura.nm; +package org.eclipse.kura.nm.enums; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue;