Refactor SH ServiceDataStoreOperationsImpl

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic2753f63bb74923d5c423764d51bce8a4a69fafb

diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java
index d3c1ccfe47a9a31e229957163184f1c146b690b9..1d82544f0a33ee1c5db3646cef266188d5e465a3 100644 (file)
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java
@@ -10,12 +10,10 @@ package org.opendaylight.transportpce.servicehandler.service;
 import com.google.common.util.concurrent.FluentFuture;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -92,9 +90,10 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
         try {
             LOG.info("initializing service registry");
             WriteTransaction transaction = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<ServiceList> iid = InstanceIdentifier.create(ServiceList.class);
-            ServiceList initialRegistry = new ServiceListBuilder().build();
-            transaction.put(LogicalDatastoreType.OPERATIONAL, iid, initialRegistry);
+            transaction.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServiceList.class),
+                new ServiceListBuilder().build());
             FluentFuture<? extends @NonNull CommitInfo> future = transaction.commit();
             future.get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
@@ -106,9 +105,10 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
         try {
             LOG.info("initializing temp service registry");
             WriteTransaction transaction = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<TempServiceList> iid = InstanceIdentifier.create(TempServiceList.class);
-            TempServiceList initialRegistry = new TempServiceListBuilder().build();
-            transaction.put(LogicalDatastoreType.OPERATIONAL, iid, initialRegistry);
+            transaction.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(TempServiceList.class),
+                new TempServiceListBuilder().build());
             FluentFuture<? extends @NonNull CommitInfo> future = transaction.commit();
             future.get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
@@ -119,12 +119,13 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     @Override
     public Optional<Services> getService(String serviceName) {
         try {
-            ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction();
-            InstanceIdentifier<Services> iid =
-                    InstanceIdentifier.create(ServiceList.class).child(Services.class, new ServicesKey(serviceName));
-            Future<java.util.Optional<Services>> future =
-                    readTx.read(LogicalDatastoreType.OPERATIONAL, iid);
-            return future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
+            return this.dataBroker.newReadOnlyTransaction()
+                    .read(
+                        LogicalDatastoreType.OPERATIONAL,
+                        InstanceIdentifier.create(ServiceList.class)
+                            .child(Services.class, new ServicesKey(serviceName))
+                        )
+                    .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.warn("Reading service {} failed:", serviceName, e);
         }
@@ -134,12 +135,11 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     @Override
     public Optional<ServiceList> getServices() {
         try {
-            ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction();
-            InstanceIdentifier<ServiceList> iid =
-                    InstanceIdentifier.create(ServiceList.class);
-            Future<java.util.Optional<ServiceList>> future =
-                    readTx.read(LogicalDatastoreType.OPERATIONAL, iid);
-            return future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
+            return this.dataBroker.newReadOnlyTransaction()
+                    .read(
+                        LogicalDatastoreType.OPERATIONAL,
+                        InstanceIdentifier.create(ServiceList.class))
+                    .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.warn("Reading services failed:", e);
         }
@@ -147,19 +147,19 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     }
 
     @Override
-    public Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.Services>
-            getTempService(String serviceName) {
+    public Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+            .temp.service.list.Services> getTempService(String serviceName) {
         try {
-            ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction();
-            InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                .Services> iid = InstanceIdentifier.create(TempServiceList.class).child(
-                    org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.Services.class,
-                    new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.ServicesKey(
-                        serviceName));
-            FluentFuture<Optional<
-                org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.Services>> future
-                = readTx.read(LogicalDatastoreType.OPERATIONAL, iid);
-            return future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
+            return this.dataBroker.newReadOnlyTransaction()
+                    .read(
+                        LogicalDatastoreType.OPERATIONAL,
+                        InstanceIdentifier.create(TempServiceList.class)
+                            .child(
+                                org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                                    .temp.service.list.Services.class,
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                                    .temp.service.list.ServicesKey(serviceName)))
+                    .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.warn("Reading service {} failed:", serviceName, e);
         }
@@ -171,9 +171,10 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
         LOG.debug(DELETING_SERVICE_MSG, serviceName);
         try {
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<Services> iid =
-                    InstanceIdentifier.create(ServiceList.class).child(Services.class, new ServicesKey(serviceName));
-            writeTx.delete(LogicalDatastoreType.OPERATIONAL, iid);
+            writeTx.delete(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServiceList.class)
+                    .child(Services.class, new ServicesKey(serviceName)));
             writeTx.commit().get(Timeouts.DATASTORE_DELETE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -187,12 +188,14 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
         LOG.debug(DELETING_SERVICE_MSG, commonId);
         try {
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                .Services> iid = InstanceIdentifier.create(TempServiceList.class).child(org.opendaylight.yang.gen.v1
-                        .http.org.openroadm.service.rev230526.temp.service.list.Services.class,
-                        new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                            .ServicesKey(commonId));
-            writeTx.delete(LogicalDatastoreType.OPERATIONAL, iid);
+            writeTx.delete(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(TempServiceList.class)
+                    .child(
+                        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.Services.class,
+                        new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.ServicesKey(commonId)));
             writeTx.commit().get(Timeouts.DATASTORE_DELETE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -205,19 +208,20 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public OperationResult modifyService(String serviceName, State operationalState, AdminStates administrativeState) {
         LOG.debug("Modifying '{}' Service", serviceName);
         Optional<Services> readService = getService(serviceName);
-        if (!readService.isPresent()) {
+        if (readService.isEmpty()) {
             LOG.warn("modifyService: {}", LogMessages.SERVICE_NOT_FOUND);
             return OperationResult.failed(LogMessages.SERVICE_NOT_FOUND);
         }
         try {
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<Services> iid = InstanceIdentifier.create(ServiceList.class)
-                    .child(Services.class, new ServicesKey(serviceName));
-            Services services = new ServicesBuilder(readService.orElseThrow())
-                .setOperationalState(operationalState)
-                .setAdministrativeState(administrativeState)
-                .build();
-            writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, services);
+            writeTx.merge(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServiceList.class)
+                    .child(Services.class, new ServicesKey(serviceName)),
+                new ServicesBuilder(readService.orElseThrow())
+                    .setOperationalState(operationalState)
+                    .setAdministrativeState(administrativeState)
+                    .build());
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -227,29 +231,30 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     }
 
     @Override
-    public OperationResult modifyTempService(String serviceName, State operationalState,
-        AdminStates administrativeState) {
+    public OperationResult modifyTempService(
+            String serviceName, State operationalState, AdminStates administrativeState) {
         LOG.debug("Modifying '{}' Temp Service", serviceName);
-        Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-            .Services> readService = getTempService(serviceName);
-        if (!readService.isPresent()) {
+        Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                .temp.service.list.Services> readService = getTempService(serviceName);
+        if (readService.isEmpty()) {
             LOG.warn("modifyTempService: {}", LogMessages.SERVICE_NOT_FOUND);
             return OperationResult.failed(LogMessages.SERVICE_NOT_FOUND);
         }
         try {
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                .Services> iid = InstanceIdentifier.create(TempServiceList.class)
-                    .child(org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                            .Services.class, new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
-                                .temp.service.list.ServicesKey(serviceName));
-            org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.Services services =
-                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list.ServicesBuilder(
-                    readService.orElseThrow())
-                .setOperationalState(operationalState)
-                .setAdministrativeState(administrativeState)
-                .build();
-            writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, services);
+            writeTx.merge(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(TempServiceList.class)
+                    .child(
+                        org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.Services.class,
+                        new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.ServicesKey(serviceName)),
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                        .temp.service.list.ServicesBuilder(readService.orElseThrow())
+                    .setOperationalState(operationalState)
+                    .setAdministrativeState(administrativeState)
+                    .build());
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -262,11 +267,12 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public OperationResult createService(ServiceCreateInput serviceCreateInput) {
         LOG.debug("Writing '{}' Service", serviceCreateInput.getServiceName());
         try {
-            InstanceIdentifier<Services> iid = InstanceIdentifier.create(ServiceList.class)
-                    .child(Services.class, new ServicesKey(serviceCreateInput.getServiceName()));
-            Services service = ModelMappingUtils.mappingServices(serviceCreateInput, null);
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            writeTx.put(LogicalDatastoreType.OPERATIONAL, iid, service);
+            writeTx.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServiceList.class)
+                    .child(Services.class, new ServicesKey(serviceCreateInput.getServiceName())),
+                ModelMappingUtils.mappingServices(serviceCreateInput, null));
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -282,15 +288,15 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
                     .service.path.rpc.result.PathDescription pathDescription) {
         LOG.debug("Writing '{}' Temp Service", tempServiceCreateInput.getCommonId());
         try {
-            InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                .Services> iid = InstanceIdentifier.create(TempServiceList.class)
-                    .child(org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                            .Services.class, new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp
-                                .service.list.ServicesKey(tempServiceCreateInput.getCommonId()));
-            org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.temp.service.list
-                .Services service = ModelMappingUtils.mappingServices(tempServiceCreateInput, pathDescription);
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            writeTx.put(LogicalDatastoreType.OPERATIONAL, iid, service);
+            writeTx.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(TempServiceList.class)
+                    .child(org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.Services.class,
+                        new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526
+                            .temp.service.list.ServicesKey(tempServiceCreateInput.getCommonId())),
+                ModelMappingUtils.mappingServices(tempServiceCreateInput, pathDescription));
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -304,11 +310,11 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public Optional<ServicePathList> getServicePaths() {
         LOG.debug("Retrieving list of ServicePath...");
         try {
-            ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction();
-            InstanceIdentifier<ServicePathList> servicePathListIID = InstanceIdentifier.create(ServicePathList.class);
-            Future<java.util.Optional<ServicePathList>> future = readTx.read(LogicalDatastoreType.OPERATIONAL,
-                    servicePathListIID);
-            return future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
+            return this.dataBroker.newReadOnlyTransaction()
+                    .read(
+                        LogicalDatastoreType.OPERATIONAL,
+                        InstanceIdentifier.create(ServicePathList.class))
+                    .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.error("Reading service path list failed. Error={}", e.getMessage());
         }
@@ -319,12 +325,12 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public Optional<ServicePaths> getServicePath(String serviceName) {
         LOG.debug("Retrieving service path of service {}", serviceName);
         try {
-            ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction();
-            InstanceIdentifier<ServicePaths> servicePathsIID = InstanceIdentifier.create(ServicePathList.class)
-                    .child(ServicePaths.class, new ServicePathsKey(serviceName));
-            Future<java.util.Optional<ServicePaths>> future = readTx.read(LogicalDatastoreType.OPERATIONAL,
-                    servicePathsIID);
-            return future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
+            return this.dataBroker.newReadOnlyTransaction()
+                    .read(
+                        LogicalDatastoreType.OPERATIONAL,
+                        InstanceIdentifier.create(ServicePathList.class)
+                            .child(ServicePaths.class, new ServicePathsKey(serviceName)))
+                    .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.error("Reading service path failed. Error={}", e.getMessage());
         }
@@ -335,11 +341,12 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public OperationResult createServicePath(ServiceInput serviceInput, PathComputationRequestOutput outputFromPce) {
         LOG.debug("Writing '{}' ServicePath ", serviceInput.getServiceName());
         try {
-            InstanceIdentifier<ServicePaths> servicePathsIID = InstanceIdentifier.create(ServicePathList.class)
-                    .child(ServicePaths.class, new ServicePathsKey(serviceInput.getServiceName()));
-            ServicePaths servicePath = ModelMappingUtils.mappingServicePaths(serviceInput, outputFromPce);
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            writeTx.put(LogicalDatastoreType.OPERATIONAL, servicePathsIID, servicePath);
+            writeTx.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServicePathList.class)
+                    .child(ServicePaths.class, new ServicePathsKey(serviceInput.getServiceName())),
+                ModelMappingUtils.mappingServicePaths(serviceInput, outputFromPce));
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -353,15 +360,17 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
     public OperationResult modifyServicePath(PathDescription pathDescription, String serviceName) {
         LOG.debug("Updating servicePath because of a change in the openroadm-topology");
         Optional<ServicePaths> readServicePath = getServicePath(serviceName);
-        if (!readServicePath.isPresent()) {
+        if (readServicePath.isEmpty()) {
             LOG.warn("modifyServicePath: {}", LogMessages.SERVICE_PATH_NOT_FOUND);
             return OperationResult.failed(LogMessages.SERVICE_PATH_NOT_FOUND);
         }
         try {
             WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
-            InstanceIdentifier<ServicePaths> iid = InstanceIdentifier.create(ServicePathList.class)
-                    .child(ServicePaths.class, new ServicePathsKey(serviceName));
-            ServicePaths servicePaths = new ServicePathsBuilder()
+            writeTx.merge(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServicePathList.class)
+                    .child(ServicePaths.class, new ServicePathsKey(serviceName)),
+                new ServicePathsBuilder()
                     .setServiceAEnd(readServicePath.orElseThrow().getServiceAEnd())
                     .setServiceHandlerHeader(readServicePath.orElseThrow().getServiceHandlerHeader())
                     .setServicePathName(readServicePath.orElseThrow().getServicePathName())
@@ -374,9 +383,7 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
                     .setPathDescription(pathDescription)
                     .setPceRoutingMetric(readServicePath.orElseThrow().getPceRoutingMetric())
                     .setSoftConstraints(readServicePath.orElseThrow().getSoftConstraints())
-                    .build();
-
-            writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, servicePaths);
+                    .build());
             writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
             return OperationResult.ok(LogMessages.SUCCESSFUL_MESSAGE);
         } catch (TimeoutException | InterruptedException | ExecutionException e) {
@@ -387,7 +394,8 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
 
     @Override
     public OperationResult deleteServicePath(String serviceName) {
-        InstanceIdentifier<ServicePaths> servicePathsIID = InstanceIdentifier.create(ServicePathList.class)
+        InstanceIdentifier<ServicePaths> servicePathsIID =
+            InstanceIdentifier.create(ServicePathList.class)
                 .child(ServicePaths.class, new ServicePathsKey(serviceName));
         LOG.debug("Deleting service from {}", servicePathsIID);
         WriteTransaction servicePathsWriteTx = this.dataBroker.newWriteOnlyTransaction();
@@ -416,26 +424,25 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
      */
     @Deprecated
     @Override
-    public String writeOrModifyOrDeleteServiceList(String serviceName, ServiceCreateInput input,
-            PathComputationRequestOutput output, int choice) {
+    public String writeOrModifyOrDeleteServiceList(
+            String serviceName, ServiceCreateInput input, PathComputationRequestOutput output, int choice) {
         LOG.debug("WriteOrModifyOrDeleting '{}' Service", serviceName);
         WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
         Optional<Services> readService = getService(serviceName);
-
         /*
          * Write Service.
          */
-        if (!readService.isPresent()) {
+        if (readService.isEmpty()) {
             if (choice != 2) {
                 LOG.warn("writeOrModifyOrDeleteServiceList: {}", LogMessages.SERVICE_NOT_FOUND);
                 return LogMessages.SERVICE_NOT_FOUND;
             }
-
             LOG.debug("Writing '{}' Service", serviceName);
-            InstanceIdentifier<Services> iid = InstanceIdentifier.create(ServiceList.class)
-                    .child(Services.class, new ServicesKey(serviceName));
-            Services service = ModelMappingUtils.mappingServices(input, null);
-            writeTx.put(LogicalDatastoreType.OPERATIONAL, iid, service);
+            writeTx.put(
+                LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(ServiceList.class)
+                    .child(Services.class, new ServicesKey(serviceName)),
+                ModelMappingUtils.mappingServices(input, null));
             try {
                 writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
                 return null;
@@ -449,15 +456,18 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
          * Modify / Delete Service.
          */
         InstanceIdentifier<Services> iid =
-                InstanceIdentifier.create(ServiceList.class).child(Services.class, new ServicesKey(serviceName));
-        ServicesBuilder service = new ServicesBuilder(readService.orElseThrow());
+            InstanceIdentifier.create(ServiceList.class).child(Services.class, new ServicesKey(serviceName));
         String action = null;
         switch (choice) {
             case 0 : /* Modify. */
                 LOG.debug("Modifying '{}' Service", serviceName);
-                service.setOperationalState(State.InService)
-                    .setAdministrativeState(AdminStates.InService);
-                writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, service.build());
+                writeTx.merge(
+                    LogicalDatastoreType.OPERATIONAL,
+                    iid,
+                    new ServicesBuilder(readService.orElseThrow())
+                        .setOperationalState(State.InService)
+                        .setAdministrativeState(AdminStates.InService)
+                        .build());
                 action = "modifyService";
                 break;
             case 1 : /* Delete */