X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsamples%2Fclustering-test-app%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fclustering%2Fit%2Fprovider%2FCarProvider.java;h=a6f154bfcde7282b7b0bdb6c0d5a7166bdbd3238;hb=3859df9beca8f13f1ff2b2744ed3470a1715bec3;hp=c0744de3a1e10d1340477a89bb9cc7da60dc3c00;hpb=258d8039ac144aeee2efa7943228c0fc6cdaf651;p=controller.git diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java index c0744de3a1..a6f154bfcd 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java @@ -9,11 +9,11 @@ package org.opendaylight.controller.clustering.it.provider; import com.google.common.base.Stopwatch; import com.google.common.collect.Sets; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -77,6 +77,7 @@ import org.slf4j.LoggerFactory; * * @author Thomas Pantelis */ +@SuppressFBWarnings("SLF4J_ILLEGAL_PASSED_CLASS") public class CarProvider implements CarService { private static final Logger LOG_PURCHASE_CAR = LoggerFactory.getLogger(PurchaseCarProvider.class); @@ -159,7 +160,7 @@ public class CarProvider implements CarService { failureCounter.set(0); WriteTransaction tx = dataProvider.newWriteOnlyTransaction(); - InstanceIdentifier carsId = InstanceIdentifier.builder(Cars.class).build(); + InstanceIdentifier carsId = InstanceIdentifier.create(Cars.class); tx.merge(LogicalDatastoreType.CONFIGURATION, carsId, new CarsBuilder().build()); try { tx.submit().checkedGet(5, TimeUnit.SECONDS); @@ -179,10 +180,8 @@ public class CarProvider implements CarService { WriteTransaction tx1 = dataProvider.newWriteOnlyTransaction(); CarEntry car = new CarEntryBuilder().setId(new CarId("car" + id)).build(); tx1.put(LogicalDatastoreType.CONFIGURATION, - InstanceIdentifier.builder(Cars.class).child(CarEntry.class, car.getKey()).build(), - car); - CheckedFuture future = tx1.submit(); - Futures.addCallback(future, new FutureCallback() { + InstanceIdentifier.builder(Cars.class).child(CarEntry.class, car.key()).build(), car); + Futures.addCallback(tx1.submit(), new FutureCallback() { @Override public void onSuccess(final Void result) {