Bump upstream versions

[controller.git] / opendaylight / md-sal / samples / toaster-provider / src / main / java / org / opendaylight / controller / sample / toaster / provider / OpendaylightToaster.java

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 0fcd474d9c0e631185a37e28836f40b8e66dd822..20e544903d6d727e1e532f72a8f62fd2d6cad976 100644 (file)
--- 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,14 +7,13 @@
  */
 package org.opendaylight.controller.sample.toaster.provider;
 
+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.Preconditions;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -29,6 +28,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
+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;
@@ -66,6 +66,8 @@ 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.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -100,7 +102,7 @@ public class OpendaylightToaster extends AbstractMXBean
 
     public OpendaylightToaster() {
         this(new ToasterAppConfigBuilder().setManufacturer(TOASTER_MANUFACTURER).setModelNumber(TOASTER_MODEL_NUMBER)
-                .setMaxMakeToastTries(2).build());
+                .setMaxMakeToastTries(Uint16.valueOf(2)).build());
     }
 
     public OpendaylightToaster(final ToasterAppConfig toasterAppConfig) {
@@ -120,9 +122,8 @@ public class OpendaylightToaster extends AbstractMXBean
     public void init() {
         LOG.info("Initializing...");
 
-        Preconditions.checkNotNull(dataBroker, "dataBroker must be set");
-        dataTreeChangeListenerRegistration = dataBroker.registerDataTreeChangeListener(
-                DataTreeIdentifier.create(CONFIGURATION, TOASTER_IID), this);
+        dataTreeChangeListenerRegistration = requireNonNull(dataBroker, "dataBroker must be set")
+            .registerDataTreeChangeListener(DataTreeIdentifier.create(CONFIGURATION, TOASTER_IID), this);
         setToasterStatusUp(null);
 
         // Register our MXBean.
@@ -185,9 +186,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: {}",
@@ -215,11 +216,11 @@ public class OpendaylightToaster extends AbstractMXBean
      */
     @Override
     public ListenableFuture<RpcResult<MakeToastOutput>> makeToast(final MakeToastInput input) {
-        LOG.info("makeToast: " + input);
+        LOG.info("makeToast: {}", input);
 
         final SettableFuture<RpcResult<MakeToastOutput>> futureResult = SettableFuture.create();
 
-        checkStatusAndMakeToast(input, futureResult, toasterAppConfig.getMaxMakeToastTries());
+        checkStatusAndMakeToast(input, futureResult, toasterAppConfig.getMaxMakeToastTries().toJava());
 
         return futureResult;
     }
@@ -322,9 +323,9 @@ public class OpendaylightToaster extends AbstractMXBean
      */
     @Override
     public ListenableFuture<RpcResult<RestockToasterOutput>> restockToaster(final RestockToasterInput input) {
-        LOG.info("restockToaster: " + input);
+        LOG.info("restockToaster: {}", input);
 
-        amountOfBreadInStock.set(input.getAmountOfBreadToStock());
+        amountOfBreadInStock.set(input.getAmountOfBreadToStock().toJava());
 
         if (amountOfBreadInStock.get() > 0) {
             ToasterRestocked reStockedNotification = new ToasterRestockedBuilder()
@@ -399,7 +400,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");