Fix some problems introduced after checkstyle enforcement

[genius.git] / mdsalutil / mdsalutil-api / src / main / java / org / opendaylight / genius / utils / batching / ResourceBatchingManager.java

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java
index 7061735d9e317eeda2b4af44065278d6d2018191..5cb6e81b7a7314cfdacb742ef80f5ca4d4be6609 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/batching/ResourceBatchingManager.java
@@ -47,7 +47,7 @@ public class ResourceBatchingManager implements AutoCloseable {
     private static final int PERIODICITY_IN_MS = 500;
     private static final int BATCH_SIZE = 1000;
 
-    public enum SHARD_RESOURCE {
+    public enum ShardResource {
         CONFIG_TOPOLOGY(LogicalDatastoreType.CONFIGURATION),
         OPERATIONAL_TOPOLOGY(LogicalDatastoreType.OPERATIONAL),
         CONFIG_INVENTORY(LogicalDatastoreType.CONFIGURATION),
@@ -56,13 +56,14 @@ public class ResourceBatchingManager implements AutoCloseable {
         BlockingQueue<ActionableResource> queue = new LinkedBlockingQueue<>();
         LogicalDatastoreType datastoreType;
 
-        SHARD_RESOURCE(LogicalDatastoreType datastoreType) {
+        ShardResource(LogicalDatastoreType datastoreType) {
             this.datastoreType = datastoreType;
         }
 
-        public LogicalDatastoreType getDatastoreType(){
+        public LogicalDatastoreType getDatastoreType() {
             return datastoreType;
         }
+
         BlockingQueue<ActionableResource> getQueue() {
             return queue;
         }
@@ -98,7 +99,8 @@ public class ResourceBatchingManager implements AutoCloseable {
             throw new RuntimeException("Resource type already registered");
         }
         resourceHandlerMapper.put(resourceType, new ImmutablePair<>(resQueue, resHandler));
-        ScheduledThreadPoolExecutor resDelegatorService = (ScheduledThreadPoolExecutor) Executors.newScheduledThreadPool(1);
+        ScheduledThreadPoolExecutor resDelegatorService = (ScheduledThreadPoolExecutor) Executors
+                .newScheduledThreadPool(1);
         resourceBatchingThreadMapper.put(resourceType, resDelegatorService);
         LOG.info("Registered resourceType {} with batchSize {} and batchInterval {}", resourceType,
                 resHandler.getBatchSize(), resHandler.getBatchInterval());
@@ -113,26 +115,27 @@ public class ResourceBatchingManager implements AutoCloseable {
         Integer batchSize = Integer.getInteger("resource.manager.batch.size", BATCH_SIZE);
         Integer batchInterval = Integer.getInteger("resource.manager.batch.periodicity.ms", PERIODICITY_IN_MS);
 
-        for (SHARD_RESOURCE shardResource : SHARD_RESOURCE.values()) {
+        for (ShardResource shardResource : ShardResource.values()) {
             if (resourceHandlerMapper.containsKey(shardResource.name())) {
                 continue;
             }
-            DefaultBatchHandler batchHandler = new DefaultBatchHandler(broker, shardResource.datastoreType, batchSize, batchInterval);
+            DefaultBatchHandler batchHandler = new DefaultBatchHandler(broker, shardResource.datastoreType, batchSize,
+                    batchInterval);
             registerBatchableResource(shardResource.name(), shardResource.getQueue(), batchHandler);
         }
     }
 
-    public void put(SHARD_RESOURCE shardResource, InstanceIdentifier identifier, DataObject updatedData) {
+    public void merge(ShardResource shardResource, InstanceIdentifier identifier, DataObject updatedData) {
         BlockingQueue<ActionableResource> queue = shardResource.getQueue();
         if (queue != null) {
             ActionableResource actResource = new ActionableResourceImpl(identifier.toString(),
-                    identifier, ActionableResource.CREATE, updatedData, null/*oldData*/);
+                    identifier, ActionableResource.UPDATE, updatedData, null/*oldData*/);
             queue.add(actResource);
         }
     }
 
-    public void merge(SHARD_RESOURCE shardResource, InstanceIdentifier identifier, DataObject updatedData) {
-        BlockingQueue<ActionableResource> queue = shardResource.getQueue();
+    public void merge(String resourceType, InstanceIdentifier identifier, DataObject updatedData) {
+        BlockingQueue<ActionableResource> queue = getQueue(resourceType);
         if (queue != null) {
             ActionableResource actResource = new ActionableResourceImpl(identifier.toString(),
                     identifier, ActionableResource.UPDATE, updatedData, null/*oldData*/);
@@ -140,7 +143,7 @@ public class ResourceBatchingManager implements AutoCloseable {
         }
     }
 
-    public void delete(SHARD_RESOURCE shardResource, InstanceIdentifier identifier) {
+    public void delete(ShardResource shardResource, InstanceIdentifier identifier) {
         BlockingQueue<ActionableResource> queue = shardResource.getQueue();
         if (queue != null) {
             ActionableResource actResource = new ActionableResourceImpl(identifier.toString(),
@@ -149,29 +152,29 @@ public class ResourceBatchingManager implements AutoCloseable {
         }
     }
 
-    public void put(String resourceType, InstanceIdentifier identifier, DataObject updatedData) {
+    public void delete(String resourceType, InstanceIdentifier identifier) {
         BlockingQueue<ActionableResource> queue = getQueue(resourceType);
         if (queue != null) {
             ActionableResource actResource = new ActionableResourceImpl(identifier.toString(),
-                    identifier, ActionableResource.CREATE, updatedData, null/*oldData*/);
+                    identifier, ActionableResource.DELETE, null, null/*oldData*/);
             queue.add(actResource);
         }
     }
 
-    public void merge(String resourceType, InstanceIdentifier identifier, DataObject updatedData) {
-        BlockingQueue<ActionableResource> queue = getQueue(resourceType);
+    public void put(ShardResource shardResource, InstanceIdentifier identifier, DataObject updatedData) {
+        BlockingQueue<ActionableResource> queue = shardResource.getQueue();
         if (queue != null) {
             ActionableResource actResource = new ActionableResourceImpl(identifier.toString(),
-                    identifier, ActionableResource.UPDATE, updatedData, null/*oldData*/);
+                    identifier, ActionableResource.CREATE, updatedData, null/*oldData*/);
             queue.add(actResource);
         }
     }
 
-    public void delete(String resourceType, InstanceIdentifier identifier) {
+    public void put(String resourceType, InstanceIdentifier identifier, DataObject updatedData) {
         BlockingQueue<ActionableResource> queue = getQueue(resourceType);
         if (queue != null) {
             ActionableResource actResource = new ActionableResourceImpl(identifier.toString(),
-                    identifier, ActionableResource.DELETE, null, null/*oldData*/);
+                    identifier, ActionableResource.CREATE, updatedData, null/*oldData*/);
             queue.add(actResource);
         }
     }
@@ -183,7 +186,6 @@ public class ResourceBatchingManager implements AutoCloseable {
         return null;
     }
 
-
     public void deregisterBatchableResource(String resourceType) {
         resourceHandlerMapper.remove(resourceType);
         resourceBatchingThreadMapper.remove(resourceType);
@@ -305,19 +307,23 @@ public class ResourceBatchingManager implements AutoCloseable {
                     for (SubTransaction object : transactionObjects) {
                         WriteTransaction writeTransaction = broker.newWriteOnlyTransaction();
                         switch (object.getAction()) {
-                            case SubTransaction.CREATE :
-                                writeTransaction.put(dsType, object.getInstanceIdentifier(), (DataObject)object.getInstance(), true);
+                            case SubTransaction.CREATE:
+                                writeTransaction.put(dsType, object.getInstanceIdentifier(),
+                                        (DataObject) object.getInstance(), true);
                                 break;
-                            case SubTransaction.DELETE :
+                            case SubTransaction.DELETE:
                                 writeTransaction.delete(dsType, object.getInstanceIdentifier());
                                 break;
-                            case SubTransaction.UPDATE :
-                                writeTransaction.merge(dsType, object.getInstanceIdentifier(), (DataObject)object.getInstance(), true);
+                            case SubTransaction.UPDATE:
+                                writeTransaction.merge(dsType, object.getInstanceIdentifier(),
+                                        (DataObject) object.getInstance(), true);
                                 break;
                             default:
-                                LOG.error("Unable to determine Action for transaction object with id {}", object.getInstanceIdentifier());
+                                LOG.error("Unable to determine Action for transaction object with id {}",
+                                        object.getInstanceIdentifier());
                         }
-                        CheckedFuture<Void, TransactionCommitFailedException> futureOperation = writeTransaction.submit();
+                        CheckedFuture<Void, TransactionCommitFailedException> futureOperation = writeTransaction
+                                .submit();
                         try {
                             futureOperation.get();
                         } catch (InterruptedException | ExecutionException exception) {
@@ -326,9 +332,8 @@ public class ResourceBatchingManager implements AutoCloseable {
                         }
                     }
                 }
-
-            } catch (final Exception e) {
-                LOG.error("Transaction submission failed", e);
+            } finally {
+                LOG.error("Transaction submission failed");
             }
         }
     }