Remove RestconfDataServiceConstant.PostData

This is a useless holder of a single String, move it towards its
majority user, noting a FIXME for reuse.

Change-Id: Ifa296fd3d34f707a3e7e58ad15632b68b53d7c05
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java
index 1331269dbedc54b525c9759863174b0ed9fc9eab..55c4b7c46fa7f76e1a607cd8a50f90c70dbdca1d 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java
@@ -47,6 +47,8 @@ import org.slf4j.LoggerFactory;
  */
 public final class PostDataTransactionUtil {
     private static final Logger LOG = LoggerFactory.getLogger(PostDataTransactionUtil.class);
+    // FIXME: why is this being reused from other places?
+    static final String POST_TX_TYPE = "POST";
 
     private PostDataTransactionUtil() {
         // Hidden on purpose
@@ -74,8 +76,7 @@ public final class PostDataTransactionUtil {
         final URI location = resolveLocation(uriInfo, path, schemaContext, payload.getData());
         final ResponseFactory dataFactory = new ResponseFactory(Status.CREATED).location(location);
         //This method will close transactionChain if any
-        FutureCallbackTx.addCallback(future, RestconfDataServiceConstant.PostData.POST_TX_TYPE, dataFactory,
-                strategy.getTransactionChain());
+        FutureCallbackTx.addCallback(future, POST_TX_TYPE, dataFactory, strategy.getTransactionChain());
         return dataFactory.build();
     }
 
@@ -214,11 +215,11 @@ public final class PostDataTransactionUtil {
         strategy.merge(datastore, YangInstanceIdentifier.create(emptySubtree.getIdentifier()), emptySubtree);
         for (final LeafSetEntryNode<?> nodeChild : readLeafList.getValue()) {
             if (lastInsertedPosition == lastItemPosition) {
-                checkItemDoesNotExists(strategy, datastore, path, RestconfDataServiceConstant.PostData.POST_TX_TYPE);
+                checkItemDoesNotExists(strategy, datastore, path);
                 strategy.create(datastore, path, payload);
             }
             final YangInstanceIdentifier childPath = path.getParent().getParent().node(nodeChild.getIdentifier());
-            checkItemDoesNotExists(strategy, datastore, childPath, RestconfDataServiceConstant.PostData.POST_TX_TYPE);
+            checkItemDoesNotExists(strategy, datastore, childPath);
             strategy.create(datastore, childPath, nodeChild);
             lastInsertedPosition++;
         }
@@ -248,11 +249,11 @@ public final class PostDataTransactionUtil {
         strategy.merge(datastore, YangInstanceIdentifier.create(emptySubtree.getIdentifier()), emptySubtree);
         for (final MapEntryNode mapEntryNode : readList.getValue()) {
             if (lastInsertedPosition == lastItemPosition) {
-                checkItemDoesNotExists(strategy, datastore, path, RestconfDataServiceConstant.PostData.POST_TX_TYPE);
+                checkItemDoesNotExists(strategy, datastore, path);
                 strategy.create(datastore, path, payload);
             }
             final YangInstanceIdentifier childPath = path.getParent().getParent().node(mapEntryNode.getIdentifier());
-            checkItemDoesNotExists(strategy, datastore, childPath, RestconfDataServiceConstant.PostData.POST_TX_TYPE);
+            checkItemDoesNotExists(strategy, datastore, childPath);
             strategy.create(datastore, childPath, mapEntryNode);
             lastInsertedPosition++;
         }
@@ -264,8 +265,7 @@ public final class PostDataTransactionUtil {
             boolean merge = false;
             for (final MapEntryNode child : ((MapNode) data).getValue()) {
                 final YangInstanceIdentifier childPath = path.node(child.getIdentifier());
-                checkItemDoesNotExists(strategy, LogicalDatastoreType.CONFIGURATION, childPath,
-                        RestconfDataServiceConstant.PostData.POST_TX_TYPE);
+                checkItemDoesNotExists(strategy, LogicalDatastoreType.CONFIGURATION, childPath);
                 if (!merge) {
                     merge = true;
                     TransactionUtil.ensureParentsByMerge(path, schemaContext, strategy);
@@ -276,8 +276,7 @@ public final class PostDataTransactionUtil {
                 strategy.create(LogicalDatastoreType.CONFIGURATION, childPath, child);
             }
         } else {
-            checkItemDoesNotExists(strategy, LogicalDatastoreType.CONFIGURATION, path,
-                    RestconfDataServiceConstant.PostData.POST_TX_TYPE);
+            checkItemDoesNotExists(strategy, LogicalDatastoreType.CONFIGURATION, path);
 
             TransactionUtil.ensureParentsByMerge(path, schemaContext, strategy);
             strategy.create(LogicalDatastoreType.CONFIGURATION, path, data);
@@ -315,7 +314,7 @@ public final class PostDataTransactionUtil {
     private static void simplePost(final LogicalDatastoreType datastore, final YangInstanceIdentifier path,
                                    final NormalizedNode<?, ?> payload,
                                    final SchemaContext schemaContext, final RestconfStrategy strategy) {
-        checkItemDoesNotExists(strategy, datastore, path, RestconfDataServiceConstant.PostData.POST_TX_TYPE);
+        checkItemDoesNotExists(strategy, datastore, path);
         TransactionUtil.ensureParentsByMerge(path, schemaContext, strategy);
         strategy.create(datastore, path, payload);
     }
@@ -331,12 +330,11 @@ public final class PostDataTransactionUtil {
      * @param operationType Type of operation (READ, POST, PUT, DELETE...)
      */
     private static void checkItemDoesNotExists(final RestconfStrategy strategy,
-                                               final LogicalDatastoreType store, final YangInstanceIdentifier path,
-                                               final String operationType) {
+                                               final LogicalDatastoreType store, final YangInstanceIdentifier path) {
         final FluentFuture<Boolean> future = strategy.exists(store, path);
         final FutureDataFactory<Boolean> response = new FutureDataFactory<>();
 
-        FutureCallbackTx.addCallback(future, operationType, response);
+        FutureCallbackTx.addCallback(future, POST_TX_TYPE, response);
 
         if (response.result) {
             // close transaction

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfDataServiceConstant.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfDataServiceConstant.java
index 15fb4ae38e4a27b597130a3730e0396ef18c83e3..21567abf59f80ec2711a7035910de6ba4f0d8b72 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfDataServiceConstant.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfDataServiceConstant.java
@@ -108,18 +108,6 @@ public final class RestconfDataServiceConstant {
         }
     }
 
-    /**
-     * Constants for data to post.
-     *
-     */
-    public static final class PostData {
-        public static final String POST_TX_TYPE = "POST";
-
-        private PostData() {
-            throw new UnsupportedOperationException("Util class.");
-        }
-    }
-
     /**
      * Constants for data to yang patch.
      *

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfInvokeOperationsUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfInvokeOperationsUtil.java
index 6d3d6f2e9c8fe6fd527c45559fcf474a78583b54..c2e1f80801d46601ddb09fe629b2b59ec9c24845 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfInvokeOperationsUtil.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/RestconfInvokeOperationsUtil.java
@@ -117,7 +117,7 @@ public final class RestconfInvokeOperationsUtil {
 
     private static DOMRpcResult prepareResult(final ListenableFuture<? extends DOMRpcResult> rpc) {
         final RpcResultFactory dataFactory = new RpcResultFactory();
-        FutureCallbackTx.addCallback(rpc, RestconfDataServiceConstant.PostData.POST_TX_TYPE, dataFactory);
+        FutureCallbackTx.addCallback(rpc, PostDataTransactionUtil.POST_TX_TYPE, dataFactory);
         return dataFactory.build();
     }
 
@@ -191,7 +191,7 @@ public final class RestconfInvokeOperationsUtil {
      */
     private static DOMActionResult prepareActionResult(final ListenableFuture<? extends DOMActionResult> actionResult) {
         final ActionResultFactory dataFactory = new ActionResultFactory();
-        FutureCallbackTx.addCallback(actionResult, RestconfDataServiceConstant.PostData.POST_TX_TYPE, dataFactory);
+        FutureCallbackTx.addCallback(actionResult, PostDataTransactionUtil.POST_TX_TYPE, dataFactory);
         return dataFactory.build();
     }