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>
*/
public final class PostDataTransactionUtil {
private static final Logger LOG = LoggerFactory.getLogger(PostDataTransactionUtil.class);
*/
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
private PostDataTransactionUtil() {
// Hidden on purpose
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
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();
}
return dataFactory.build();
}
strategy.merge(datastore, YangInstanceIdentifier.create(emptySubtree.getIdentifier()), emptySubtree);
for (final LeafSetEntryNode<?> nodeChild : readLeafList.getValue()) {
if (lastInsertedPosition == lastItemPosition) {
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());
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++;
}
strategy.create(datastore, childPath, nodeChild);
lastInsertedPosition++;
}
strategy.merge(datastore, YangInstanceIdentifier.create(emptySubtree.getIdentifier()), emptySubtree);
for (final MapEntryNode mapEntryNode : readList.getValue()) {
if (lastInsertedPosition == lastItemPosition) {
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());
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++;
}
strategy.create(datastore, childPath, mapEntryNode);
lastInsertedPosition++;
}
boolean merge = false;
for (final MapEntryNode child : ((MapNode) data).getValue()) {
final YangInstanceIdentifier childPath = path.node(child.getIdentifier());
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);
if (!merge) {
merge = true;
TransactionUtil.ensureParentsByMerge(path, schemaContext, strategy);
strategy.create(LogicalDatastoreType.CONFIGURATION, childPath, child);
}
} else {
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);
TransactionUtil.ensureParentsByMerge(path, schemaContext, strategy);
strategy.create(LogicalDatastoreType.CONFIGURATION, path, data);
private static void simplePost(final LogicalDatastoreType datastore, final YangInstanceIdentifier path,
final NormalizedNode<?, ?> payload,
final SchemaContext schemaContext, final RestconfStrategy strategy) {
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);
}
TransactionUtil.ensureParentsByMerge(path, schemaContext, strategy);
strategy.create(datastore, path, payload);
}
* @param operationType Type of operation (READ, POST, PUT, DELETE...)
*/
private static void checkItemDoesNotExists(final RestconfStrategy strategy,
* @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<>();
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
if (response.result) {
// close transaction
- /**
- * 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.
*
/**
* Constants for data to yang patch.
*
private static DOMRpcResult prepareResult(final ListenableFuture<? extends DOMRpcResult> rpc) {
final RpcResultFactory dataFactory = new RpcResultFactory();
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();
}
return dataFactory.build();
}
*/
private static DOMActionResult prepareActionResult(final ListenableFuture<? extends DOMActionResult> actionResult) {
final ActionResultFactory dataFactory = new ActionResultFactory();
*/
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();
}
return dataFactory.build();
}