Fold PlainPatchDataTransactionUtil.mergeDataWithinTransaction()

This is a very simple method, fold it into its sole caller.

Change-Id: I2a17ec37443346c8f46b9b066458ef7552a1413c
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/PlainPatchDataTransactionUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtil.java
index 371b155f1b3475e10585210c7a7e2130d8f80863..a4ab1bcaeaa8ce97c548c3a6726c985f6ff523fc 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtil.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtil.java
@@ -51,7 +51,9 @@ public final class PlainPatchDataTransactionUtil {
         NormalizedNode<?, ?> data = payload.getData();
 
         try {
-            mergeDataWithinTransaction(LogicalDatastoreType.CONFIGURATION, path, data, strategy, schemaContext);
+            LOG.trace("Merge CONFIGURATION within Restconf Patch: {} with payload {}", path, data);
+            TransactionUtil.ensureParentsByMerge(path, schemaContext, strategy);
+            strategy.merge(LogicalDatastoreType.CONFIGURATION, path, data);
         } catch (final RestconfDocumentedException e) {
             strategy.cancel();
             throw new IllegalArgumentException(e);
@@ -65,23 +67,4 @@ public final class PlainPatchDataTransactionUtil {
 
         return response.build();
     }
-
-    /**
-     * Merge data within one transaction.
-     *
-     * @param dataStore     Datastore to merge data to
-     * @param path          Path for data to be merged
-     * @param payload       Data to be merged
-     * @param strategy      Object that perform the actual DS operations
-     * @param schemaContext global schema context
-     */
-    private static void mergeDataWithinTransaction(final LogicalDatastoreType dataStore,
-                                                   final YangInstanceIdentifier path,
-                                                   final NormalizedNode<?, ?> payload,
-                                                   final RestconfStrategy strategy,
-                                                   final EffectiveModelContext schemaContext) {
-        LOG.trace("Merge {} within Restconf Patch: {} with payload {}", dataStore.name(), path, payload);
-        TransactionUtil.ensureParentsByMerge(path, schemaContext, strategy);
-        strategy.merge(dataStore, path, payload);
-    }
 }