Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor SupportedIfCapability usage
[transportpce.git]
/
test-common
/
src
/
main
/
java
/
org
/
opendaylight
/
transportpce
/
test
/
utils
/
TopologyDataUtils.java
diff --git
a/test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java
b/test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java
index 198db6ba66596106f904d4a5c265fefb8bafa2b2..859a329fad96960f7d5e7f1233fc247509bcacf1 100644
(file)
--- a/
test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java
+++ b/
test-common/src/main/java/org/opendaylight/transportpce/test/utils/TopologyDataUtils.java
@@
-20,7
+20,7
@@
import org.opendaylight.mdsal.common.api.CommitInfo;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.transportpce.test.DataStoreContext;
import org.opendaylight.transportpce.test.converter.XMLDataObjectConverter;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.transportpce.test.DataStoreContext;
import org.opendaylight.transportpce.test.converter.XMLDataObjectConverter;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev2
10315
.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev2
20316
.Network;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@
-32,6
+32,10
@@
public final class TopologyDataUtils {
private static final Logger LOG = LoggerFactory.getLogger(TopologyDataUtils.class);
private static final Logger LOG = LoggerFactory.getLogger(TopologyDataUtils.class);
+ @SuppressWarnings({"unchecked","rawtypes"})
+ // FIXME check if the InstanceIdentifier raw type can be avoided
+ // Raw types use are discouraged since they lack type safety.
+ // Resulting Problems are observed at run time and not at compile time
public static <T> void writeTopologyFromFileToDatastore(DataStoreContext dataStoreContextUtil, String file,
InstanceIdentifier ii) throws InterruptedException, ExecutionException {
Networks networks = null;
public static <T> void writeTopologyFromFileToDatastore(DataStoreContext dataStoreContextUtil, String file,
InstanceIdentifier ii) throws InterruptedException, ExecutionException {
Networks networks = null;
@@
-39,7
+43,7
@@
public final class TopologyDataUtils {
if (topoFile.exists()) {
String fileName = topoFile.getName();
try (InputStream targetStream = new FileInputStream(topoFile)) {
if (topoFile.exists()) {
String fileName = topoFile.getName();
try (InputStream targetStream = new FileInputStream(topoFile)) {
- Optional<NormalizedNode
<?, ?>
> transformIntoNormalizedNode = XMLDataObjectConverter
+ Optional<NormalizedNode> transformIntoNormalizedNode = XMLDataObjectConverter
.createWithDataStoreUtil(dataStoreContextUtil).transformIntoNormalizedNode(targetStream);
if (!transformIntoNormalizedNode.isPresent()) {
throw new IllegalStateException(String.format(
.createWithDataStoreUtil(dataStoreContextUtil).transformIntoNormalizedNode(targetStream);
if (!transformIntoNormalizedNode.isPresent()) {
throw new IllegalStateException(String.format(
@@
-67,7
+71,10
@@
public final class TopologyDataUtils {
LOG.info("extraction from {} stored with success in datastore", topoFile.getName());
}
LOG.info("extraction from {} stored with success in datastore", topoFile.getName());
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked","rawtypes"})
+ // FIXME check if the InstanceIdentifier raw type can be avoided
+ // Raw types use are discouraged since they lack type safety.
+ // Resulting Problems are observed at run time and not at compile time
private static FluentFuture<? extends CommitInfo> writeTransaction(DataBroker dataBroker,
InstanceIdentifier instanceIdentifier, DataObject object) {
WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
private static FluentFuture<? extends CommitInfo> writeTransaction(DataBroker dataBroker,
InstanceIdentifier instanceIdentifier, DataObject object) {
WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
@@
-82,7
+89,7
@@
public final class TopologyDataUtils {
if (portmappingFile.exists()) {
String fileName = portmappingFile.getName();
try (InputStream targetStream = new FileInputStream(portmappingFile)) {
if (portmappingFile.exists()) {
String fileName = portmappingFile.getName();
try (InputStream targetStream = new FileInputStream(portmappingFile)) {
- Optional<NormalizedNode
<?, ?>
> transformIntoNormalizedNode = null;
+ Optional<NormalizedNode> transformIntoNormalizedNode = null;
transformIntoNormalizedNode = XMLDataObjectConverter.createWithDataStoreUtil(dataStoreContextUtil)
.transformIntoNormalizedNode(targetStream);
if (!transformIntoNormalizedNode.isPresent()) {
transformIntoNormalizedNode = XMLDataObjectConverter.createWithDataStoreUtil(dataStoreContextUtil)
.transformIntoNormalizedNode(targetStream);
if (!transformIntoNormalizedNode.isPresent()) {