X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsamples%2Ftoaster-provider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsample%2Ftoaster%2Fprovider%2FOpendaylightToaster.java;h=ab91aaba3a2941564bd4e3c7818bd44e576fa83f;hb=refs%2Fchanges%2F03%2F83803%2F53;hp=4078409a680be523f70f424d5e7e0801f2ccb1d2;hpb=6602310b78b5bf54899456e2efa867d116731267;p=controller.git diff --git a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java index 4078409a68..ab91aaba3a 100644 --- a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java +++ b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java @@ -7,40 +7,50 @@ */ package org.opendaylight.controller.sample.toaster.provider; -import static org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType.DELETE; -import static org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType.WRITE; -import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.CONFIGURATION; -import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.OPERATIONAL; +import static java.util.Objects.requireNonNull; +import static org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType.DELETE; +import static org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType.WRITE; +import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; +import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL; import static org.opendaylight.yangtools.yang.common.RpcError.ErrorType.APPLICATION; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; +import com.google.common.util.concurrent.FluentFuture; 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 com.google.common.util.concurrent.SettableFuture; import java.util.Collection; +import java.util.Optional; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; -import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener; -import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; -import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.OptimisticLockFailedException; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; +import java.util.function.Function; import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.DataObjectModification; +import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; +import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; +import org.opendaylight.mdsal.binding.api.DataTreeModification; +import org.opendaylight.mdsal.binding.api.NotificationPublishService; +import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.OptimisticLockFailedException; +import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.CancelToastInput; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.CancelToastOutput; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.CancelToastOutputBuilder; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.DisplayString; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.MakeToastInput; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.MakeToastOutput; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.MakeToastOutputBuilder; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.RestockToasterInput; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.RestockToasterOutput; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.RestockToasterOutputBuilder; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.Toaster; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.Toaster.ToasterStatus; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterBuilder; @@ -56,12 +66,17 @@ import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class OpendaylightToaster extends AbstractMXBean implements ToasterService, ToasterProviderRuntimeMXBean, DataTreeChangeListener, AutoCloseable { + private static final CancelToastOutput EMPTY_CANCEL_OUTPUT = new CancelToastOutputBuilder().build(); + private static final MakeToastOutput EMPTY_MAKE_OUTPUT = new MakeToastOutputBuilder().build(); + private static final RestockToasterOutput EMPTY_RESTOCK_OUTPUT = new RestockToasterOutputBuilder().build(); + private static final Logger LOG = LoggerFactory.getLogger(OpendaylightToaster.class); private static final InstanceIdentifier TOASTER_IID = InstanceIdentifier.builder(Toaster.class).build(); @@ -89,7 +104,7 @@ public class OpendaylightToaster extends AbstractMXBean .setMaxMakeToastTries(2).build()); } - public OpendaylightToaster(ToasterAppConfig toasterAppConfig) { + public OpendaylightToaster(final ToasterAppConfig toasterAppConfig) { super("OpendaylightToaster", "toaster-provider", null); executor = Executors.newFixedThreadPool(1); this.toasterAppConfig = toasterAppConfig; @@ -106,9 +121,8 @@ public class OpendaylightToaster extends AbstractMXBean public void init() { LOG.info("Initializing..."); - Preconditions.checkNotNull(dataBroker, "dataBroker must be set"); - dataTreeChangeListenerRegistration = dataBroker.registerDataTreeChangeListener( - new DataTreeIdentifier<>(CONFIGURATION, TOASTER_IID), this); + dataTreeChangeListenerRegistration = requireNonNull(dataBroker, "dataBroker must be set") + .registerDataTreeChangeListener(DataTreeIdentifier.create(CONFIGURATION, TOASTER_IID), this); setToasterStatusUp(null); // Register our MXBean. @@ -135,9 +149,9 @@ public class OpendaylightToaster extends AbstractMXBean if (dataBroker != null) { WriteTransaction tx = dataBroker.newWriteOnlyTransaction(); tx.delete(OPERATIONAL,TOASTER_IID); - Futures.addCallback(tx.submit(), new FutureCallback() { + Futures.addCallback(tx.commit(), new FutureCallback() { @Override - public void onSuccess(final Void result) { + public void onSuccess(final CommitInfo result) { LOG.debug("Successfully deleted the operational Toaster"); } @@ -145,7 +159,7 @@ public class OpendaylightToaster extends AbstractMXBean public void onFailure(final Throwable failure) { LOG.error("Delete of the operational Toaster failed", failure); } - }); + }, MoreExecutors.directExecutor()); } } @@ -161,7 +175,7 @@ public class OpendaylightToaster extends AbstractMXBean * Implemented from the DataTreeChangeListener interface. */ @Override - public void onDataTreeChanged(Collection> changes) { + public void onDataTreeChanged(final Collection> changes) { for (DataTreeModification change: changes) { DataObjectModification rootNode = change.getRootNode(); if (rootNode.getModificationType() == WRITE) { @@ -171,9 +185,9 @@ public class OpendaylightToaster extends AbstractMXBean + "old Toaster: {}, new Toaster: {}", change.getRootPath().getRootIdentifier(), oldToaster, newToaster); - Long darkness = newToaster.getDarknessFactor(); + Uint32 darkness = newToaster.getDarknessFactor(); if (darkness != null) { - darknessFactor.set(darkness); + darknessFactor.set(darkness.toJava()); } } else if (rootNode.getModificationType() == DELETE) { LOG.info("onDataTreeChanged - Toaster config with path {} was deleted: old Toaster: {}", @@ -186,48 +200,48 @@ public class OpendaylightToaster extends AbstractMXBean * RPC call implemented from the ToasterService interface that cancels the current toast, if any. */ @Override - public Future> cancelToast() { + public ListenableFuture> cancelToast(final CancelToastInput input) { Future current = currentMakeToastTask.getAndSet(null); if (current != null) { current.cancel(true); } // Always return success from the cancel toast call - return Futures.immediateFuture(RpcResultBuilder.success().build()); + return Futures.immediateFuture(RpcResultBuilder.success(EMPTY_CANCEL_OUTPUT).build()); } /** * RPC call implemented from the ToasterService interface that attempts to make toast. */ @Override - public Future> makeToast(final MakeToastInput input) { - LOG.info("makeToast: " + input); + public ListenableFuture> makeToast(final MakeToastInput input) { + LOG.info("makeToast: {}", input); - final SettableFuture> futureResult = SettableFuture.create(); + final SettableFuture> futureResult = SettableFuture.create(); - checkStatusAndMakeToast(input, futureResult, toasterAppConfig.getMaxMakeToastTries()); + checkStatusAndMakeToast(input, futureResult, toasterAppConfig.getMaxMakeToastTries().toJava()); return futureResult; } - private RpcError makeToasterOutOfBreadError() { + private static RpcError makeToasterOutOfBreadError() { return RpcResultBuilder.newError(APPLICATION, "resource-denied", "Toaster is out of bread", "out-of-stock", null, null); } - private RpcError makeToasterInUseError() { + private static RpcError makeToasterInUseError() { return RpcResultBuilder.newWarning(APPLICATION, "in-use", "Toaster is busy", null, null, null); } - private void checkStatusAndMakeToast(final MakeToastInput input, final SettableFuture> futureResult, - final int tries) { + private void checkStatusAndMakeToast(final MakeToastInput input, + final SettableFuture> futureResult, final int tries) { // Read the ToasterStatus and, if currently Up, try to write the status to Down. // If that succeeds, then we essentially have an exclusive lock and can proceed // to make toast. final ReadWriteTransaction tx = dataBroker.newReadWriteTransaction(); - ListenableFuture> readFuture = tx.read(OPERATIONAL, TOASTER_IID); + FluentFuture> readFuture = tx.read(OPERATIONAL, TOASTER_IID); - final ListenableFuture commitFuture = + final ListenableFuture commitFuture = Futures.transformAsync(readFuture, toasterData -> { ToasterStatus toasterStatus = ToasterStatus.Up; if (toasterData.isPresent()) { @@ -240,7 +254,8 @@ public class OpendaylightToaster extends AbstractMXBean if (outOfBread()) { LOG.debug("Toaster is out of bread"); - return Futures.immediateFailedCheckedFuture( + tx.cancel(); + return Futures.immediateFailedFuture( new TransactionCommitFailedException("", makeToasterOutOfBreadError())); } @@ -250,7 +265,7 @@ public class OpendaylightToaster extends AbstractMXBean // to indicate we're going to make toast. This acts as a lock to prevent // concurrent toasting. tx.put(OPERATIONAL, TOASTER_IID, buildToaster(ToasterStatus.Down)); - return tx.submit(); + return tx.commit(); } LOG.debug("Oops - already making toast!"); @@ -258,13 +273,14 @@ public class OpendaylightToaster extends AbstractMXBean // Return an error since we are already making toast. This will get // propagated to the commitFuture below which will interpret the null // TransactionStatus in the RpcResult as an error condition. - return Futures.immediateFailedCheckedFuture( + tx.cancel(); + return Futures.immediateFailedFuture( new TransactionCommitFailedException("", makeToasterInUseError())); - }); + }, MoreExecutors.directExecutor()); - Futures.addCallback(commitFuture, new FutureCallback() { + Futures.addCallback(commitFuture, new FutureCallback() { @Override - public void onSuccess(final Void result) { + public void onSuccess(final CommitInfo result) { // OK to make toast currentMakeToastTask.set(executor.submit(new MakeToastTask(input, futureResult))); } @@ -281,22 +297,22 @@ public class OpendaylightToaster extends AbstractMXBean LOG.debug("Got OptimisticLockFailedException - trying again"); checkStatusAndMakeToast(input, futureResult, tries - 1); } else { - futureResult.set(RpcResultBuilder.failed() + futureResult.set(RpcResultBuilder.failed() .withError(ErrorType.APPLICATION, ex.getMessage()).build()); } } else if (ex instanceof TransactionCommitFailedException) { LOG.debug("Failed to commit Toaster status", ex); // Probably already making toast. - futureResult.set(RpcResultBuilder.failed() + futureResult.set(RpcResultBuilder.failed() .withRpcErrors(((TransactionCommitFailedException)ex).getErrorList()).build()); } else { LOG.debug("Unexpected error committing Toaster status", ex); - futureResult.set(RpcResultBuilder.failed().withError(ErrorType.APPLICATION, + futureResult.set(RpcResultBuilder.failed().withError(ErrorType.APPLICATION, "Unexpected error committing Toaster status", ex).build()); } } - }); + }, MoreExecutors.directExecutor()); } /** @@ -305,10 +321,10 @@ public class OpendaylightToaster extends AbstractMXBean * ToasterRestocked notification. */ @Override - public Future> restockToaster(final RestockToasterInput input) { - LOG.info("restockToaster: " + input); + public ListenableFuture> restockToaster(final RestockToasterInput input) { + LOG.info("restockToaster: {}", input); - amountOfBreadInStock.set(input.getAmountOfBreadToStock()); + amountOfBreadInStock.set(input.getAmountOfBreadToStock().toJava()); if (amountOfBreadInStock.get() > 0) { ToasterRestocked reStockedNotification = new ToasterRestockedBuilder() @@ -316,7 +332,7 @@ public class OpendaylightToaster extends AbstractMXBean notificationProvider.offerNotification(reStockedNotification); } - return Futures.immediateFuture(RpcResultBuilder.success().build()); + return Futures.immediateFuture(RpcResultBuilder.success(EMPTY_RESTOCK_OUTPUT).build()); } /** @@ -336,13 +352,13 @@ public class OpendaylightToaster extends AbstractMXBean return toastsMade.get(); } - private void setToasterStatusUp(final Function resultCallback) { + private void setToasterStatusUp(final Function resultCallback) { WriteTransaction tx = dataBroker.newWriteOnlyTransaction(); tx.put(OPERATIONAL,TOASTER_IID, buildToaster(ToasterStatus.Up)); - Futures.addCallback(tx.submit(), new FutureCallback() { + Futures.addCallback(tx.commit(), new FutureCallback() { @Override - public void onSuccess(final Void result) { + public void onSuccess(final CommitInfo result) { LOG.info("Successfully set ToasterStatus to Up"); notifyCallback(true); } @@ -361,7 +377,7 @@ public class OpendaylightToaster extends AbstractMXBean resultCallback.apply(result); } } - }); + }, MoreExecutors.directExecutor()); } private boolean outOfBread() { @@ -371,9 +387,10 @@ public class OpendaylightToaster extends AbstractMXBean private class MakeToastTask implements Callable { final MakeToastInput toastRequest; - final SettableFuture> futureResult; + final SettableFuture> futureResult; - MakeToastTask(final MakeToastInput toastRequest, final SettableFuture> futureResult) { + MakeToastTask(final MakeToastInput toastRequest, + final SettableFuture> futureResult) { this.toastRequest = toastRequest; this.futureResult = futureResult; } @@ -382,7 +399,8 @@ public class OpendaylightToaster extends AbstractMXBean public Void call() { try { // make toast just sleeps for n seconds per doneness level. - Thread.sleep(OpendaylightToaster.this.darknessFactor.get() * toastRequest.getToasterDoneness()); + Thread.sleep(OpendaylightToaster.this.darknessFactor.get() + * toastRequest.getToasterDoneness().toJava()); } catch (InterruptedException e) { LOG.info("Interrupted while making the toast"); @@ -404,7 +422,7 @@ public class OpendaylightToaster extends AbstractMXBean setToasterStatusUp(result -> { currentMakeToastTask.set(null); LOG.debug("Toast done"); - futureResult.set(RpcResultBuilder.success().build()); + futureResult.set(RpcResultBuilder.success(EMPTY_MAKE_OUTPUT).build()); return null; });