Do not use com.google.common.base.Predicate

We have Java 8, hence we can reduce the API surface.

Change-Id: I93e9b7e046d3a57ec397bda5b2756a250b1d1c21
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/FutureSchema.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/FutureSchema.java
index 741d0bce762ebafff6e1158b9ef139d60ca2bc10..fc1b634ec306d25d56f8bb2fca23ac72a0a225c2 100644 (file)
--- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/FutureSchema.java
+++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/FutureSchema.java
@@ -8,8 +8,6 @@
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl;
 
 import com.google.common.annotations.Beta;
-import com.google.common.base.Predicate;
-import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.Collection;
 import java.util.List;
@@ -17,6 +15,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Predicate;
 import org.opendaylight.mdsal.binding.javav2.runtime.context.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation;
 import org.opendaylight.yangtools.yang.common.QNameModule;
@@ -67,9 +66,8 @@ class FutureSchema implements AutoCloseable {
 
     boolean waitForSchema(final QNameModule module) {
         final FutureSchemaPredicate postponedOp = new FutureSchemaPredicate() {
-
             @Override
-            public boolean apply(final BindingRuntimeContext input) {
+            public boolean test(final BindingRuntimeContext input) {
                 return input.getSchemaContext().findModule(module).isPresent();
             }
         };
@@ -78,9 +76,8 @@ class FutureSchema implements AutoCloseable {
 
     boolean waitForSchema(final Collection<Class<?>> bindingClasses) {
         final FutureSchemaPredicate postponedOp = new FutureSchemaPredicate() {
-
             @Override
-            public boolean apply(final BindingRuntimeContext context) {
+            public boolean test(final BindingRuntimeContext context) {
                 for (final Class<?> clz : bindingClasses) {
                     if (!isSchemaAvailable(clz, context)) {
                         return false;
@@ -99,7 +96,7 @@ class FutureSchema implements AutoCloseable {
                 schemaPromise.get(duration, unit);
                 return true;
             } catch (final InterruptedException | ExecutionException e) {
-                throw Throwables.propagate(e);
+                throw new RuntimeException(e);
             } catch (final TimeoutException e) {
                 return false;
             } finally {
@@ -108,7 +105,7 @@ class FutureSchema implements AutoCloseable {
         }
 
         final void unlockIfPossible(final BindingRuntimeContext context) {
-            if (!schemaPromise.isDone() && apply(context)) {
+            if (!schemaPromise.isDone() && test(context)) {
                 schemaPromise.set(null);
             }
         }

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/UnionRenderer.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/UnionRenderer.java
index 0ed423201ae74fd99e629ad35787e58b3653a28c..7f4420e9a60138ebdacf1fe3eab6346164e3fe4f 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/UnionRenderer.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/UnionRenderer.java
@@ -5,13 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers;
 
 import static org.opendaylight.mdsal.binding.javav2.generator.util.Types.BOOLEAN;
 
 import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import java.beans.ConstructorProperties;
 import java.util.ArrayList;
@@ -199,9 +197,8 @@ public class UnionRenderer extends ClassRenderer {
                 .append(TextTemplateUtil.getterMethodName(field))
                 .append("() {\n");
 
-        Predicate<GeneratedProperty> predicate = input -> !"value".equals(input.getName());
         final List<GeneratedProperty> filtered = new ArrayList<>(Collections2.filter(this.getFinalProperties(),
-            predicate));
+            input -> !"value".equals(input.getName())));
 
         final List<CharSequence> strings = new ArrayList<>(filtered.size());