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
eclipse-kura · Jun 23, 2023 · 393fea1 · 393fea1
1 parent bcc89dc
commit 393fea1
Show file tree

Hide file tree

Showing 46 changed files with 68 additions and 54 deletions.
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
@@ -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/....eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMConfigurationEnforcementHandler.java b/....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
@@ -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
@@ -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
@@ -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/....eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/configuration/NMSettingsConverter.java b/....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/...org/eclipse/kura/nm/MMBearerIpFamily.java → ...lipse/kura/nm/enums/MMBearerIpFamily.java b/...org/eclipse/kura/nm/MMBearerIpFamily.java → ...lipse/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/nm/MMModem3gppRegistrationState.java → ...m/enums/MMModem3gppRegistrationState.java b/...kura/nm/MMModem3gppRegistrationState.java → ...m/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/...ipse/kura/nm/MMModemAccessTechnology.java → ...ura/nm/enums/MMModemAccessTechnology.java b/...ipse/kura/nm/MMModemAccessTechnology.java → ...ura/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/...java/org/eclipse/kura/nm/MMModemBand.java → ...rg/eclipse/kura/nm/enums/MMModemBand.java b/...java/org/eclipse/kura/nm/MMModemBand.java → ...rg/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/...rg/eclipse/kura/nm/MMModemCapability.java → ...ipse/kura/nm/enums/MMModemCapability.java b/...rg/eclipse/kura/nm/MMModemCapability.java → ...ipse/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/...clipse/kura/nm/MMModemLocationSource.java → .../kura/nm/enums/MMModemLocationSource.java b/...clipse/kura/nm/MMModemLocationSource.java → .../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/...java/org/eclipse/kura/nm/MMModemMode.java → ...rg/eclipse/kura/nm/enums/MMModemMode.java b/...java/org/eclipse/kura/nm/MMModemMode.java → ...rg/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/.../org/eclipse/kura/nm/MMModemPortType.java → ...clipse/kura/nm/enums/MMModemPortType.java b/.../org/eclipse/kura/nm/MMModemPortType.java → ...clipse/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/...rg/eclipse/kura/nm/MMModemPowerState.java → ...ipse/kura/nm/enums/MMModemPowerState.java b/...rg/eclipse/kura/nm/MMModemPowerState.java → ...ipse/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/...ava/org/eclipse/kura/nm/MMModemState.java → ...g/eclipse/kura/nm/enums/MMModemState.java b/...ava/org/eclipse/kura/nm/MMModemState.java → ...g/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/.../org/eclipse/kura/nm/MMSimEsimStatus.java → ...clipse/kura/nm/enums/MMSimEsimStatus.java b/.../org/eclipse/kura/nm/MMSimEsimStatus.java → ...clipse/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/...n/java/org/eclipse/kura/nm/MMSimType.java → .../org/eclipse/kura/nm/enums/MMSimType.java b/...n/java/org/eclipse/kura/nm/MMSimType.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/...lipse/kura/nm/NM80211ApSecurityFlags.java → ...kura/nm/enums/NM80211ApSecurityFlags.java b/...lipse/kura/nm/NM80211ApSecurityFlags.java → ...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/...java/org/eclipse/kura/nm/NM80211Mode.java → ...rg/eclipse/kura/nm/enums/NM80211Mode.java b/...java/org/eclipse/kura/nm/NM80211Mode.java → ...rg/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/...va/org/eclipse/kura/nm/NMDeviceState.java → .../eclipse/kura/nm/enums/NMDeviceState.java b/...va/org/eclipse/kura/nm/NMDeviceState.java → .../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/.../eclipse/kura/nm/NMDeviceStateReason.java → ...se/kura/nm/enums/NMDeviceStateReason.java b/.../eclipse/kura/nm/NMDeviceStateReason.java → ...se/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/...ava/org/eclipse/kura/nm/NMDeviceType.java → ...g/eclipse/kura/nm/enums/NMDeviceType.java b/...ava/org/eclipse/kura/nm/NMDeviceType.java → ...g/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/...pse/kura/nm/NMDeviceWifiCapabilities.java → ...ra/nm/enums/NMDeviceWifiCapabilities.java b/...pse/kura/nm/NMDeviceWifiCapabilities.java → ...ra/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/...org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/status/DevicePropertiesWrapper.java b/...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
@@ -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/.../test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMDbusConnectorTest.java b/.../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/...t/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/NMModemResetHandlerTest.java b/...t/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.nm.test/src/test/java/org/eclipse/kura/nm/configuration/NMSettingsConverterTest.java b/...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/...eclipse/kura/nm/MMBearerIpFamilyTest.java → ...e/kura/nm/enums/MMBearerIpFamilyTest.java b/...eclipse/kura/nm/MMBearerIpFamilyTest.java → ...e/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/.../nm/MMModem3gppRegistrationStateTest.java → ...ums/MMModem3gppRegistrationStateTest.java b/.../nm/MMModem3gppRegistrationStateTest.java → ...ums/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/nm/MMModemAccessTechnologyTest.java → ...nm/enums/MMModemAccessTechnologyTest.java b/.../kura/nm/MMModemAccessTechnologyTest.java → ...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/.../org/eclipse/kura/nm/MMModemBandTest.java → ...clipse/kura/nm/enums/MMModemBandTest.java b/.../org/eclipse/kura/nm/MMModemBandTest.java → ...clipse/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/...clipse/kura/nm/MMModemCapabilityTest.java → .../kura/nm/enums/MMModemCapabilityTest.java b/...clipse/kura/nm/MMModemCapabilityTest.java → .../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/...se/kura/nm/MMModemLocationSourceTest.java → ...a/nm/enums/MMModemLocationSourceTest.java b/...se/kura/nm/MMModemLocationSourceTest.java → ...a/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/.../org/eclipse/kura/nm/MMModemModeTest.java → ...clipse/kura/nm/enums/MMModemModeTest.java b/.../org/eclipse/kura/nm/MMModemModeTest.java → ...clipse/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/.../org/eclipse/kura/nm/MMModemPortTest.java → ...clipse/kura/nm/enums/MMModemPortTest.java b/.../org/eclipse/kura/nm/MMModemPortTest.java → ...clipse/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/...clipse/kura/nm/MMModemPowerStateTest.java → .../kura/nm/enums/MMModemPowerStateTest.java b/...clipse/kura/nm/MMModemPowerStateTest.java → .../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/.../eclipse/kura/nm/MMSimESimStatusTest.java → ...se/kura/nm/enums/MMSimESimStatusTest.java b/.../eclipse/kura/nm/MMSimESimStatusTest.java → ...se/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/...va/org/eclipse/kura/nm/MMSimTypeTest.java → .../eclipse/kura/nm/enums/MMSimTypeTest.java b/...va/org/eclipse/kura/nm/MMSimTypeTest.java → .../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;