Reformat sdnr devicemanager to ONAP code style

Reformat to ONAP code style

Issue-ID: SDNC-1277
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I5d3ef519bec8f3cd4316ea608c1e3eecabb8eb8d
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>

16 files changed, 75 insertions, 56 deletions

diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/factory/NetworkElementFactory.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/factory/NetworkElementFactory.java
index 08fe56f31..4b3881e0b 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/factory/NetworkElementFactory.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/factory/NetworkElementFactory.java
@@ -26,6 +26,7 @@ import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
 
 public interface NetworkElementFactory {
 
-    Optional<NetworkElement> create(@NonNull NetconfAccessor acessor, @NonNull DeviceManagerServiceProvider serviceProvider);
+    Optional<NetworkElement> create(@NonNull NetconfAccessor acessor,
+            @NonNull DeviceManagerServiceProvider serviceProvider);
 
 }
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/DeviceMonitoredNe.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/DeviceMonitoredNe.java
index 5d47c0cc1..e86559cd4 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/DeviceMonitoredNe.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/DeviceMonitoredNe.java
@@ -33,12 +33,14 @@ public interface DeviceMonitoredNe extends NetworkElementService {
 
     /**
      * Test connection to mediator, by getting data that have to be called from NE
+     * 
      * @return true if connection working, false if not
      */
     public boolean checkIfConnectionToMediatorIsOk();
 
     /**
      * Test connection to NE via mediator, by getting data that have to be called from NE
+     * 
      * @return true if connection working, false if not
      */
     public boolean checkIfConnectionToNeIsOk();
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/InventoryProvider.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/InventoryProvider.java
index d6dea7dc5..27c2e3b2d 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/InventoryProvider.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/InventoryProvider.java
@@ -21,6 +21,7 @@ import org.onap.ccsdk.features.sdnr.wt.devicemanager.types.InventoryInformationD
 
 /**
  * Provide Inventory information
+ * 
  * @author herbert
  *
  */
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/NetworkElement.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/NetworkElement.java
index e6ebfdcd5..7c3841ee9 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/NetworkElement.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/ne/service/NetworkElement.java
@@ -39,10 +39,8 @@ public interface NetworkElement extends NetworkElementService {
     /** self selected device type **/
     NetworkElementDeviceType getDeviceType();
 
-    /** Provide optional service interface.
-     * Services:
-     *     InventoryProvider.class
-     *     DeviceMonitoredNe.class
+    /**
+     * Provide optional service interface. Services: InventoryProvider.class DeviceMonitoredNe.class
      **/
     <L extends NetworkElementService> Optional<L> getService(Class<L> clazz);
 
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/DeviceManagerServiceProvider.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/DeviceManagerServiceProvider.java
index efccdf0a4..741123b87 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/DeviceManagerServiceProvider.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/DeviceManagerServiceProvider.java
@@ -23,23 +23,29 @@ import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
 
 public interface DeviceManagerServiceProvider {
 
-    /** @return Get a dataprovider**/
-    @NonNull DataProvider getDataProvider();
+    /** @return Get a dataprovider **/
+    @NonNull
+    DataProvider getDataProvider();
 
     /** @return Get notification service **/
-    @NonNull NotificationService getNotificationService();
+    @NonNull
+    NotificationService getNotificationService();
 
     /** @return Get service for handling fault **/
-    @NonNull FaultService getFaultService();
+    @NonNull
+    FaultService getFaultService();
 
     /** @return Get service for handling fault **/
-    @NonNull EquipmentService getEquipmentService();
+    @NonNull
+    EquipmentService getEquipmentService();
 
     /** @return Get Active and available inventory service */
-    @NonNull AaiService getAaiService();
+    @NonNull
+    AaiService getAaiService();
 
     /** @return MaintenanceService object for maintenance service */
-    @NonNull MaintenanceService getMaintenanceService();
+    @NonNull
+    MaintenanceService getMaintenanceService();
 
     /** @return related service instance */
     @NonNull
@@ -50,5 +56,6 @@ public interface DeviceManagerServiceProvider {
     EventHandlingService getEventHandlingService();
 
     /** @return Get configuration descriptor */
-    @NonNull ConfigurationFileRepresentation getConfigurationFileRepresentation();
+    @NonNull
+    ConfigurationFileRepresentation getConfigurationFileRepresentation();
 }
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/EquipmentService.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/EquipmentService.java
index a809e6774..10a3aa670 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/EquipmentService.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/EquipmentService.java
@@ -30,6 +30,7 @@ public interface EquipmentService extends DeviceManagerService {
 
     /**
      * Write equipment to database
+     * 
      * @param equipment with all equipment entities (card, subrack) of device
      */
     void writeEquipment(@NonNull EquipmentData equipment);
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/FaultService.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/FaultService.java
index dc2ce93db..d8a175036 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/FaultService.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/FaultService.java
@@ -30,13 +30,16 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
  */
 public interface FaultService extends DeviceManagerService {
 
-    /** Notify fault information to devicemanager
+    /**
+     * Notify fault information to devicemanager
+     * 
      * @param faultNotification to send
      */
     void faultNotification(@NonNull FaultlogEntity faultNotification);
 
     /**
      * Fault notification
+     * 
      * @param nodeId of node
      * @param counter provided
      * @param timeStamp provided
@@ -44,11 +47,12 @@ public interface FaultService extends DeviceManagerService {
      * @param problem provided
      * @param severity provided
      */
-    void faultNotification(@NonNull NodeId nodeId, @Nullable Integer counter, @Nullable DateAndTime timeStamp, @Nullable String objectId,
-            @Nullable String problem, @Nullable SeverityType severity);
+    void faultNotification(@NonNull NodeId nodeId, @Nullable Integer counter, @Nullable DateAndTime timeStamp,
+            @Nullable String objectId, @Nullable String problem, @Nullable SeverityType severity);
 
     /**
      * Remove current problems of node
+     * 
      * @param nodeId of node
      * @return number of removed entries
      */
@@ -56,6 +60,7 @@ public interface FaultService extends DeviceManagerService {
 
     /**
      * Write initial list of problems of node
+     * 
      * @param nodeId of node
      * @param resultList
      */
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/MaintenanceService.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/MaintenanceService.java
index d0eab3550..8a2ffd880 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/MaintenanceService.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/MaintenanceService.java
@@ -20,9 +20,9 @@ package org.onap.ccsdk.features.sdnr.wt.devicemanager.service;
 public interface MaintenanceService extends DeviceManagerService {
 
     /**
-     * Verify maintenance state of given object according to the filter settings.
-     * The object is specified by the criteria provided in the parameters.
-     * The data _id (uuid) is equal to the mountpointReference.
+     * Verify maintenance state of given object according to the filter settings. The object is specified by the
+     * criteria provided in the parameters. The data _id (uuid) is equal to the mountpointReference.
+     * 
      * @param mountpointReference used as reference, to query the data from database.
      * @param objectIdRef first level id in onf core model, delivered by notification objectid
      * @param problem problem name of device, delivered in problem notification
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NetconfNetworkElementService.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NetconfNetworkElementService.java
index d2d4cd5ff..80a7e2f07 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NetconfNetworkElementService.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NetconfNetworkElementService.java
@@ -25,7 +25,8 @@ import org.opendaylight.yangtools.concepts.Registration;
 public interface NetconfNetworkElementService extends Registration, DeviceManagerService {
 
     /** Register factory class for network-element handler **/
-    @NonNull <L extends NetworkElementFactory> FactoryRegistration<L> registerNetworkElementFactory(@NonNull L factory);
+    @NonNull
+    <L extends NetworkElementFactory> FactoryRegistration<L> registerNetworkElementFactory(@NonNull L factory);
 
     /** Get Devicemanager service **/
     DeviceManagerServiceProvider getServiceProvider();
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NotificationService.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NotificationService.java
index f3f82caca..3e1589a4d 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NotificationService.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/service/NotificationService.java
@@ -33,13 +33,16 @@ public interface NotificationService extends DeviceManagerService {
     void eventNotification(@NonNull EventlogEntity eventNotification);
 
     /** create notification for an object **/
-    void creationNotification(NodeId nodeId, @Nullable Integer counter, @Nullable DateAndTime timeStamp, @Nullable String objectId);
+    void creationNotification(NodeId nodeId, @Nullable Integer counter, @Nullable DateAndTime timeStamp,
+            @Nullable String objectId);
 
     /** create notification of object **/
     void deletionNotification(NodeId nodeId, @Nullable Integer counter, @Nullable DateAndTime timeStamp,
             @Nullable String objectId);
 
-    /** change notification of attribute of object
+    /**
+     * change notification of attribute of object
+     * 
      * @param nodeId of device
      * @param counter provided
      * @param timeStamp provided
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/EquipmentData.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/EquipmentData.java
index cb251cbd4..f4ae48fe7 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/EquipmentData.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/EquipmentData.java
@@ -62,6 +62,7 @@ public class EquipmentData {
 
     /**
      * Get list with all equipment
+     * 
      * @return list with equipment
      */
     public List<Inventory> getList() {
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/FaultData.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/FaultData.java
index c2c1706dd..51cf2680f 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/FaultData.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/FaultData.java
@@ -79,8 +79,7 @@ public class FaultData {
     /**
      *
      */
-    public void clear() {
-    }
+    public void clear() {}
 
     /**
      * @param idx of element to get
@@ -92,6 +91,7 @@ public class FaultData {
 
     /**
      * Provide list with all problems of node
+     * 
      * @return list
      */
     public List<Faultlog> getProblemList() {
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/FaultNotificationBuilder2.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/FaultNotificationBuilder2.java
index 62ba644e1..facf142a5 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/FaultNotificationBuilder2.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/FaultNotificationBuilder2.java
@@ -30,7 +30,8 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 public class FaultNotificationBuilder2 extends FaultlogBuilder {
 
     public FaultNotificationBuilder2(NodeId nodeId, @Nullable Integer counter, @Nullable DateAndTime timeStamp,
-            @Nullable String objectId, @Nullable String problem, @Nullable SeverityType severity, SourceType sourceType) {
+            @Nullable String objectId, @Nullable String problem, @Nullable SeverityType severity,
+            SourceType sourceType) {
 
         setNodeId(nodeId.getValue());
         if (counter != null) {
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/InternalConnectionStatus.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/InternalConnectionStatus.java
index bc6f3c554..ae1b5c88c 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/InternalConnectionStatus.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/InternalConnectionStatus.java
@@ -22,16 +22,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev15
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionLogStatus;
 
 public class InternalConnectionStatus {
-	public static ConnectionLogStatus statusFromNodeStatus(ConnectionStatus nodeStatus) {
-		switch(nodeStatus) {
-		case Connected:
-			return ConnectionLogStatus.Connected;
-		case Connecting:
-			return ConnectionLogStatus.Connecting;
-		case UnableToConnect:
-			return ConnectionLogStatus.UnableToConnect;
-		default:
-			return ConnectionLogStatus.Undefined;
-		}
-	}
+    public static ConnectionLogStatus statusFromNodeStatus(ConnectionStatus nodeStatus) {
+        switch (nodeStatus) {
+            case Connected:
+                return ConnectionLogStatus.Connected;
+            case Connecting:
+                return ConnectionLogStatus.Connecting;
+            case UnableToConnect:
+                return ConnectionLogStatus.UnableToConnect;
+            default:
+                return ConnectionLogStatus.Undefined;
+        }
+    }
 }
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/InventoryInformationDcae.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/InventoryInformationDcae.java
index 7e25f6035..cf43a5735 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/InventoryInformationDcae.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/types/InventoryInformationDcae.java
@@ -36,28 +36,26 @@ public class InventoryInformationDcae {
     private String deviceIpv6;
     private List<String> interfaceUuidList;
 
-    public InventoryInformationDcae()
-    {
-        this.type=UNKNOWN;
-        this.model=UNKNOWN;
-        this.vendor=UNKNOWN;
-        this.deviceIpv4=UNKNOWN;
-        this.deviceIpv6=UNKNOWN;
-        this.interfaceUuidList=EMPTY;
+    public InventoryInformationDcae() {
+        this.type = UNKNOWN;
+        this.model = UNKNOWN;
+        this.vendor = UNKNOWN;
+        this.deviceIpv4 = UNKNOWN;
+        this.deviceIpv6 = UNKNOWN;
+        this.interfaceUuidList = EMPTY;
     }
 
     public InventoryInformationDcae(InventoryInformationDcae inventoryInformation) {
-        this.type=inventoryInformation.type;
-        this.model=inventoryInformation.model;
-        this.vendor=inventoryInformation.vendor;
-        this.deviceIpv4=inventoryInformation.deviceIpv4;
-        this.deviceIpv6=inventoryInformation.deviceIpv6;
-        this.interfaceUuidList=new ArrayList<>(inventoryInformation.interfaceUuidList);
+        this.type = inventoryInformation.type;
+        this.model = inventoryInformation.model;
+        this.vendor = inventoryInformation.vendor;
+        this.deviceIpv4 = inventoryInformation.deviceIpv4;
+        this.deviceIpv6 = inventoryInformation.deviceIpv6;
+        this.interfaceUuidList = new ArrayList<>(inventoryInformation.interfaceUuidList);
     }
 
-    public InventoryInformationDcae(
-                String type, String model, String vendor, String deviceIpv4,
-                String deviceIpv6, List<String> interfaceUuidList) {
+    public InventoryInformationDcae(String type, String model, String vendor, String deviceIpv4, String deviceIpv6,
+            List<String> interfaceUuidList) {
         setType(type);
         setModel(model);
         setVendor(vendor);
@@ -111,7 +109,7 @@ public class InventoryInformationDcae {
     }
 
     public InventoryInformationDcae setDeviceIpv6(String deviceIpv6) {
-        this.deviceIpv6 = deviceIpv6 != null ? deviceIpv6 : UNKNOWN ;
+        this.deviceIpv6 = deviceIpv6 != null ? deviceIpv6 : UNKNOWN;
         return this;
     }
 
diff --git a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/util/UnkownDevicemanagerServiceException.java b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/util/UnkownDevicemanagerServiceException.java
index d47961607..b5193689e 100644
--- a/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/util/UnkownDevicemanagerServiceException.java
+++ b/sdnr/wt/devicemanager/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/util/UnkownDevicemanagerServiceException.java
@@ -22,7 +22,7 @@ public class UnkownDevicemanagerServiceException extends Exception {
     private static final long serialVersionUID = 1L;
 
     public UnkownDevicemanagerServiceException(String string, Class<?> serviceInterface) {
-        super(string+" "+serviceInterface.getName());
+        super(string + " " + serviceInterface.getName());
     }