From: Stephen Kitt Date: Wed, 2 Nov 2016 12:33:43 +0000 (+0100) Subject: Java 8: use lambdas and function references X-Git-Tag: release/carbon~262 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=a84f141fe3633d5380ca1fb8b41afc4cd770dcfd;p=yangtools.git Java 8: use lambdas and function references This simply switches functional declarations to lambdas where possible, and lambdas to function references where possible. Change-Id: I3c0c97349b05aa8e8ecdda85906cbe41ed5c9c1a Signed-off-by: Stephen Kitt --- diff --git a/common/object-cache-api/src/main/java/org/opendaylight/yangtools/objcache/spi/NoopObjectCacheBinder.java b/common/object-cache-api/src/main/java/org/opendaylight/yangtools/objcache/spi/NoopObjectCacheBinder.java index 0ff3365027..e8791157dd 100644 --- a/common/object-cache-api/src/main/java/org/opendaylight/yangtools/objcache/spi/NoopObjectCacheBinder.java +++ b/common/object-cache-api/src/main/java/org/opendaylight/yangtools/objcache/spi/NoopObjectCacheBinder.java @@ -7,17 +7,10 @@ */ package org.opendaylight.yangtools.objcache.spi; -import org.opendaylight.yangtools.objcache.ObjectCache; - public final class NoopObjectCacheBinder extends AbstractObjectCacheBinder { public static final NoopObjectCacheBinder INSTANCE = new NoopObjectCacheBinder(); private NoopObjectCacheBinder() { - super(new IObjectCacheFactory() { - @Override - public ObjectCache getObjectCache(final Class objClass) { - return NoopObjectCache.getInstance(); - } - }); + super(objClass -> NoopObjectCache.getInstance()); } } diff --git a/common/object-cache-noop/src/main/java/org/opendaylight/yangtools/objcache/impl/StaticObjectCacheBinder.java b/common/object-cache-noop/src/main/java/org/opendaylight/yangtools/objcache/impl/StaticObjectCacheBinder.java index 3ef9fbf941..3153ff2cc7 100644 --- a/common/object-cache-noop/src/main/java/org/opendaylight/yangtools/objcache/impl/StaticObjectCacheBinder.java +++ b/common/object-cache-noop/src/main/java/org/opendaylight/yangtools/objcache/impl/StaticObjectCacheBinder.java @@ -7,21 +7,14 @@ */ package org.opendaylight.yangtools.objcache.impl; -import org.opendaylight.yangtools.objcache.ObjectCache; import org.opendaylight.yangtools.objcache.spi.AbstractObjectCacheBinder; -import org.opendaylight.yangtools.objcache.spi.IObjectCacheFactory; import org.opendaylight.yangtools.objcache.spi.NoopObjectCache; public final class StaticObjectCacheBinder extends AbstractObjectCacheBinder { private static final StaticObjectCacheBinder INSTANCE = new StaticObjectCacheBinder(); private StaticObjectCacheBinder() { - super(new IObjectCacheFactory() { - @Override - public ObjectCache getObjectCache(final Class objClass) { - return NoopObjectCache.getInstance(); - } - }); + super(objClass -> NoopObjectCache.getInstance()); } public static StaticObjectCacheBinder getInstance() { diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListeningExecutorServiceTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListeningExecutorServiceTest.java index 635753467c..83451004f8 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListeningExecutorServiceTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListeningExecutorServiceTest.java @@ -160,10 +160,7 @@ public class AsyncNotifyingListeningExecutorServiceTest { @Test public void testDelegatedMethods() throws InterruptedException { - Runnable task = new Runnable() { - @Override - public void run(){ - } + Runnable task = () -> { }; List taskList = Lists.newArrayList(); diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java index c4cc4baa07..7404c8c384 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java @@ -26,49 +26,25 @@ public class CommonTestUtils { CountDownLatch blockingLatch ); } - public static final Invoker SUBMIT_CALLABLE = new Invoker() { + public static final Invoker SUBMIT_CALLABLE = (executor, blockingLatch) -> executor.submit(new Callable() { @Override - public ListenableFuture invokeExecutor( ListeningExecutorService executor, - final CountDownLatch blockingLatch ) { - return executor.submit( new Callable() { - @Override - public Void call() throws Exception { - if (blockingLatch != null ) { - Uninterruptibles.awaitUninterruptibly( blockingLatch ); - } - return null; - } - } ); + public Void call() throws Exception { + if (blockingLatch != null ) { + Uninterruptibles.awaitUninterruptibly( blockingLatch ); + } + return null; } - }; + } ); - public static final Invoker SUBMIT_RUNNABLE = new Invoker() { - @Override - public ListenableFuture invokeExecutor( ListeningExecutorService executor, - final CountDownLatch blockingLatch ) { - return executor.submit( new Runnable() { - @Override - public void run() { - if (blockingLatch != null ) { - Uninterruptibles.awaitUninterruptibly( blockingLatch ); - } - } - } ); + public static final Invoker SUBMIT_RUNNABLE = (executor, blockingLatch) -> executor.submit(() -> { + if (blockingLatch != null ) { + Uninterruptibles.awaitUninterruptibly( blockingLatch ); } - }; + }); - public static final Invoker SUBMIT_RUNNABLE_WITH_RESULT = new Invoker() { - @Override - public ListenableFuture invokeExecutor( ListeningExecutorService executor, - final CountDownLatch blockingLatch ) { - return executor.submit( new Runnable() { - @Override - public void run() { - if (blockingLatch != null ) { - Uninterruptibles.awaitUninterruptibly( blockingLatch ); - } - } - }, "foo" ); + public static final Invoker SUBMIT_RUNNABLE_WITH_RESULT = (executor, blockingLatch) -> executor.submit(() -> { + if (blockingLatch != null ) { + Uninterruptibles.awaitUninterruptibly( blockingLatch ); } - }; + }, "foo" ); } diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java index e14499f7d7..fa322277f7 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java @@ -22,9 +22,9 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; @@ -45,30 +45,15 @@ public class DeadlockDetectingListeningExecutorServiceTest { void invokeExecutor( ListeningExecutorService executor, Runnable task ); } - static final InitialInvoker SUBMIT = new InitialInvoker() { - @Override - public void invokeExecutor( final ListeningExecutorService executor, final Runnable task ) { - executor.submit( task ); - } - }; + static final InitialInvoker SUBMIT = ListeningExecutorService::submit; - static final InitialInvoker EXECUTE = new InitialInvoker() { - @Override - public void invokeExecutor( final ListeningExecutorService executor, final Runnable task ) { - executor.execute( task ); - } - }; + static final InitialInvoker EXECUTE = Executor::execute; @SuppressWarnings("serial") public static class TestDeadlockException extends Exception { } - private static final Supplier DEADLOCK_EXECUTOR_SUPPLIER = new Supplier() { - @Override - public Exception get() { - return new TestDeadlockException(); - } - }; + private static final Supplier DEADLOCK_EXECUTOR_SUPPLIER = TestDeadlockException::new; DeadlockDetectingListeningExecutorService executor; @@ -95,29 +80,18 @@ public class DeadlockDetectingListeningExecutorServiceTest { // Test submit with Callable. - ListenableFuture future = executor.submit( new Callable() { - @Override - public String call() throws Exception{ - return "foo"; - } - } ); + ListenableFuture future = executor.submit(() -> "foo"); assertEquals( "Future result", "foo", future.get( 5, TimeUnit.SECONDS ) ); // Test submit with Runnable. - executor.submit( new Runnable() { - @Override - public void run(){ - } - } ).get(); + executor.submit(() -> { + }).get(); // Test submit with Runnable and value. - future = executor.submit( new Runnable() { - @Override - public void run(){ - } + future = executor.submit(() -> { }, "foo" ); assertEquals( "Future result", "foo", future.get( 5, TimeUnit.SECONDS ) ); @@ -141,26 +115,18 @@ public class DeadlockDetectingListeningExecutorServiceTest { final AtomicReference caughtEx = new AtomicReference<>(); final CountDownLatch futureCompletedLatch = new CountDownLatch( 1 ); - Runnable task = new Runnable() { - @SuppressWarnings({ "unchecked", "rawtypes" }) + Runnable task = () -> Futures.addCallback( invoker.invokeExecutor( executor, null ), new FutureCallback() { @Override - public void run() { - - Futures.addCallback( invoker.invokeExecutor( executor, null ), new FutureCallback() { - @Override - public void onSuccess( final Object result ) { - futureCompletedLatch.countDown(); - } - - @Override - public void onFailure( final Throwable t ) { - caughtEx.set( t ); - futureCompletedLatch.countDown(); - } - } ); + public void onSuccess( final Object result ) { + futureCompletedLatch.countDown(); } - }; + @Override + public void onFailure( final Throwable t ) { + caughtEx.set( t ); + futureCompletedLatch.countDown(); + } + } ); initialInvoker.invokeExecutor( executor, task ); @@ -190,21 +156,17 @@ public class DeadlockDetectingListeningExecutorServiceTest { final AtomicReference caughtEx = new AtomicReference<>(); final CountDownLatch latch = new CountDownLatch( 1 ); - Runnable task = new Runnable() { - @Override - public void run() { - - try { - invoker.invokeExecutor( executor, null ).get(); - } catch( ExecutionException e ) { - caughtEx.set( e.getCause() ); - } catch( Throwable e ) { - caughtEx.set( e ); - } finally { - latch.countDown(); - } - } + Runnable task = () -> { + try { + invoker.invokeExecutor( executor, null ).get(); + } catch( ExecutionException e ) { + caughtEx.set( e.getCause() ); + } catch( Throwable e ) { + caughtEx.set( e ); + } finally { + latch.countDown(); + } }; initialInvoker.invokeExecutor( executor, task ); diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java index f8bb50d9ab..b78ff441cd 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java @@ -88,19 +88,15 @@ public class NormalizedNodeToJsonStreamTest { final Writer writer = new StringWriter(); final NormalizedNode leafNodeInContainer = TestingNormalizedNodeStructuresCreator.leafNodeInContainer(); final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafNodeInContainer); - new JsonValidator() { + ((JsonValidator) jsonOutput1 -> { + final JsonObject cont1 = resolveCont1(jsonOutput1); + assertNotNull(cont1); - @Override - public void validate(final String jsonOutput) { - final JsonObject cont1 = resolveCont1(jsonOutput); - assertNotNull(cont1); - - final JsonPrimitive lf11 = childPrimitive(cont1, "complexjson:lf11", "lf11"); - assertNotNull(lf11); - final int asInt = lf11.getAsInt(); - assertEquals(453, asInt); - } - }.validate(jsonOutput); + final JsonPrimitive lf11 = childPrimitive(cont1, "complexjson:lf11", "lf11"); + assertNotNull(lf11); + final int asInt = lf11.getAsInt(); + assertEquals(453, asInt); + }).validate(jsonOutput); } @@ -110,25 +106,21 @@ public class NormalizedNodeToJsonStreamTest { final NormalizedNode leafListNodeInContainer = TestingNormalizedNodeStructuresCreator .leafListNodeInContainerMultiline(); final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafListNodeInContainer); - new JsonValidator() { - - @Override - public void validate(final String jsonOutput) { - final JsonObject cont1 = resolveCont1(jsonOutput); - assertNotNull(cont1); - final JsonArray lflst11 = childArray(cont1, "complexjson:lflst11", "lflst11"); - assertNotNull(lflst11); - - final HashSet lflst11Values = Sets.newHashSet(); - for (final JsonElement jsonElement : lflst11) { - assertTrue(jsonElement instanceof JsonPrimitive); - lflst11Values.add(jsonElement.getAsString()); - } - - assertEquals(Sets.newHashSet("lflst11 value2\r\nanother line 2", "lflst11 value1\nanother line 1"), - lflst11Values); + ((JsonValidator) jsonOutput1 -> { + final JsonObject cont1 = resolveCont1(jsonOutput1); + assertNotNull(cont1); + final JsonArray lflst11 = childArray(cont1, "complexjson:lflst11", "lflst11"); + assertNotNull(lflst11); + + final HashSet lflst11Values = Sets.newHashSet(); + for (final JsonElement jsonElement : lflst11) { + assertTrue(jsonElement instanceof JsonPrimitive); + lflst11Values.add(jsonElement.getAsString()); } - }.validate(jsonOutput); + + assertEquals(Sets.newHashSet("lflst11 value2\r\nanother line 2", "lflst11 value1\nanother line 1"), + lflst11Values); + }).validate(jsonOutput); } @@ -138,19 +130,15 @@ public class NormalizedNodeToJsonStreamTest { final NormalizedNode leafNodeViaAugmentationInContainer = TestingNormalizedNodeStructuresCreator .leafNodeViaAugmentationInContainer(); final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafNodeViaAugmentationInContainer); - new JsonValidator() { + ((JsonValidator) jsonOutput1 -> { + final JsonObject cont1 = resolveCont1(jsonOutput1); + assertNotNull(cont1); - @Override - public void validate(final String jsonOutput) { - final JsonObject cont1 = resolveCont1(jsonOutput); - assertNotNull(cont1); - - final JsonPrimitive lf12_1 = childPrimitive(cont1, "complexjson:lf12_1", "lf12_1"); - assertNotNull(lf12_1); - final String asString = lf12_1.getAsString(); - assertEquals("lf12 value", asString); - } - }.validate(jsonOutput); + final JsonPrimitive lf12_1 = childPrimitive(cont1, "complexjson:lf12_1", "lf12_1"); + assertNotNull(lf12_1); + final String asString = lf12_1.getAsString(); + assertEquals("lf12 value", asString); + }).validate(jsonOutput); } @@ -160,24 +148,20 @@ public class NormalizedNodeToJsonStreamTest { final NormalizedNode leafListNodeInContainer = TestingNormalizedNodeStructuresCreator .leafListNodeInContainer(); final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafListNodeInContainer); - new JsonValidator() { - - @Override - public void validate(final String jsonOutput) { - final JsonObject cont1 = resolveCont1(jsonOutput); - assertNotNull(cont1); - final JsonArray lflst11 = childArray(cont1, "complexjson:lflst11", "lflst11"); - assertNotNull(lflst11); - - final HashSet lflst11Values = Sets.newHashSet(); - for (final JsonElement jsonElement : lflst11) { - assertTrue(jsonElement instanceof JsonPrimitive); - lflst11Values.add(jsonElement.getAsString()); - } - - assertEquals(Sets.newHashSet("lflst11 value2", "lflst11 value1"), lflst11Values); + ((JsonValidator) jsonOutput1 -> { + final JsonObject cont1 = resolveCont1(jsonOutput1); + assertNotNull(cont1); + final JsonArray lflst11 = childArray(cont1, "complexjson:lflst11", "lflst11"); + assertNotNull(lflst11); + + final HashSet lflst11Values = Sets.newHashSet(); + for (final JsonElement jsonElement : lflst11) { + assertTrue(jsonElement instanceof JsonPrimitive); + lflst11Values.add(jsonElement.getAsString()); } - }.validate(jsonOutput); + + assertEquals(Sets.newHashSet("lflst11 value2", "lflst11 value1"), lflst11Values); + }).validate(jsonOutput); } @Test @@ -186,37 +170,33 @@ public class NormalizedNodeToJsonStreamTest { final NormalizedNode keyedListNodeInContainer = TestingNormalizedNodeStructuresCreator .keyedListNodeInContainer(); final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, keyedListNodeInContainer); - new JsonValidator() { - - @Override - public void validate(final String jsonOutput) { - final JsonObject cont1 = resolveCont1(jsonOutput); - assertNotNull(cont1); - final JsonArray lst11 = childArray(cont1, "complexjson:lst11", "lst11"); - assertNotNull(lst11); - - final Iterator iterator = lst11.iterator(); - assertTrue(iterator.hasNext()); - final JsonElement lst11Entry1Raw = iterator.next(); - assertFalse(iterator.hasNext()); - assertTrue(lst11Entry1Raw instanceof JsonObject); - final JsonObject lst11Entry1 = (JsonObject) lst11Entry1Raw; - - final JsonPrimitive key111 = childPrimitive(lst11Entry1, "complexjson:key111", "key111"); - assertNotNull(key111); - final JsonPrimitive lf112 = childPrimitive(lst11Entry1, "complexjson:lf112", "lf112"); - assertNotNull(lf112); - final JsonPrimitive lf113 = childPrimitive(lst11Entry1, "complexjson:lf113", "lf113"); - assertNotNull(lf113); - final JsonPrimitive lf111 = childPrimitive(lst11Entry1, "complexjson:lf111", "lf111"); - assertNotNull(lf111); - - assertEquals("key111 value", key111.getAsString()); - assertEquals("/complexjson:cont1/complexjson:lflst11[.='foo']", lf112.getAsString()); - assertEquals("lf113 value", lf113.getAsString()); - assertEquals("lf111 value", lf111.getAsString()); - } - }.validate(jsonOutput); + ((JsonValidator) jsonOutput1 -> { + final JsonObject cont1 = resolveCont1(jsonOutput1); + assertNotNull(cont1); + final JsonArray lst11 = childArray(cont1, "complexjson:lst11", "lst11"); + assertNotNull(lst11); + + final Iterator iterator = lst11.iterator(); + assertTrue(iterator.hasNext()); + final JsonElement lst11Entry1Raw = iterator.next(); + assertFalse(iterator.hasNext()); + assertTrue(lst11Entry1Raw instanceof JsonObject); + final JsonObject lst11Entry1 = (JsonObject) lst11Entry1Raw; + + final JsonPrimitive key111 = childPrimitive(lst11Entry1, "complexjson:key111", "key111"); + assertNotNull(key111); + final JsonPrimitive lf112 = childPrimitive(lst11Entry1, "complexjson:lf112", "lf112"); + assertNotNull(lf112); + final JsonPrimitive lf113 = childPrimitive(lst11Entry1, "complexjson:lf113", "lf113"); + assertNotNull(lf113); + final JsonPrimitive lf111 = childPrimitive(lst11Entry1, "complexjson:lf111", "lf111"); + assertNotNull(lf111); + + assertEquals("key111 value", key111.getAsString()); + assertEquals("/complexjson:cont1/complexjson:lflst11[.='foo']", lf112.getAsString()); + assertEquals("lf113 value", lf113.getAsString()); + assertEquals("lf111 value", lf111.getAsString()); + }).validate(jsonOutput); } @Test @@ -225,18 +205,14 @@ public class NormalizedNodeToJsonStreamTest { final NormalizedNode choiceNodeInContainer = TestingNormalizedNodeStructuresCreator .choiceNodeInContainer(); final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, choiceNodeInContainer); - new JsonValidator() { - - @Override - public void validate(final String jsonOutput) { - final JsonObject cont1 = resolveCont1(jsonOutput); - assertNotNull(cont1); - final JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13"); - assertNotNull(lf13); - - assertEquals("lf13 value", lf13.getAsString()); - } - }.validate(jsonOutput); + ((JsonValidator) jsonOutput1 -> { + final JsonObject cont1 = resolveCont1(jsonOutput1); + assertNotNull(cont1); + final JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13"); + assertNotNull(lf13); + + assertEquals("lf13 value", lf13.getAsString()); + }).validate(jsonOutput); } /** @@ -257,29 +233,25 @@ public class NormalizedNodeToJsonStreamTest { .caseNodeAugmentationInChoiceInContainer(); final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, caseNodeAugmentationInChoiceInContainer); - new JsonValidator() { - - @Override - public void validate(final String jsonOutput) { - final JsonObject cont1 = resolveCont1(jsonOutput); - assertNotNull(cont1); - - final JsonPrimitive lf15_21 = childPrimitive(cont1, "complexjson:lf15_21", "lf15_21"); - assertNotNull(lf15_21); - final JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13"); - assertNotNull(lf13); - final JsonPrimitive lf15_11 = childPrimitive(cont1, "complexjson:lf15_11", "lf15_11"); - assertNotNull(lf15_11); - final JsonPrimitive lf15_12 = childPrimitive(cont1, "complexjson:lf15_12", "lf15_12"); - assertNotNull(lf15_12); - - assertEquals("lf15_21 value", lf15_21.getAsString()); - assertEquals("lf13 value", lf13.getAsString()); - assertTrue("one two".equals(lf15_11.getAsString()) || "two one".equals(lf15_11.getAsString())); - assertEquals("complexjson:lf11", lf15_12.getAsString()); - - } - }.validate(jsonOutput); + ((JsonValidator) jsonOutput1 -> { + final JsonObject cont1 = resolveCont1(jsonOutput1); + assertNotNull(cont1); + + final JsonPrimitive lf15_21 = childPrimitive(cont1, "complexjson:lf15_21", "lf15_21"); + assertNotNull(lf15_21); + final JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13"); + assertNotNull(lf13); + final JsonPrimitive lf15_11 = childPrimitive(cont1, "complexjson:lf15_11", "lf15_11"); + assertNotNull(lf15_11); + final JsonPrimitive lf15_12 = childPrimitive(cont1, "complexjson:lf15_12", "lf15_12"); + assertNotNull(lf15_12); + + assertEquals("lf15_21 value", lf15_21.getAsString()); + assertEquals("lf13 value", lf13.getAsString()); + assertTrue("one two".equals(lf15_11.getAsString()) || "two one".equals(lf15_11.getAsString())); + assertEquals("complexjson:lf11", lf15_12.getAsString()); + + }).validate(jsonOutput); } /** @@ -300,32 +272,28 @@ public class NormalizedNodeToJsonStreamTest { .caseNodeExternalAugmentationInChoiceInContainer(); final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, caseNodeExternalAugmentationInChoiceInContainer); - new JsonValidator() { - - @Override - public void validate(final String jsonOutput) { - final JsonObject cont1 = resolveCont1(jsonOutput); - assertNotNull(cont1); - - final JsonPrimitive lf15_11Augment = childPrimitive(cont1, "complexjson-augmentation:lf15_11"); - assertNotNull(lf15_11Augment); - final JsonPrimitive lf15_12Augment = childPrimitive(cont1, "complexjson-augmentation:lf15_12"); - assertNotNull(lf15_12Augment); - final JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13"); - assertNotNull(lf13); - final JsonPrimitive lf15_11 = childPrimitive(cont1, "complexjson:lf15_11", "lf15_11"); - assertNotNull(lf15_11); - final JsonPrimitive lf15_12 = childPrimitive(cont1, "complexjson:lf15_12", "lf15_12"); - assertNotNull(lf15_12); - - assertEquals("lf15_11 value from augmentation", lf15_11Augment.getAsString()); - assertEquals("lf15_12 value from augmentation", lf15_12Augment.getAsString()); - assertEquals("lf13 value", lf13.getAsString()); - assertTrue("one two".equals(lf15_11.getAsString()) || "two one".equals(lf15_11.getAsString())); - assertEquals("complexjson:lf11", lf15_12.getAsString()); - - } - }.validate(jsonOutput); + ((JsonValidator) jsonOutput1 -> { + final JsonObject cont1 = resolveCont1(jsonOutput1); + assertNotNull(cont1); + + final JsonPrimitive lf15_11Augment = childPrimitive(cont1, "complexjson-augmentation:lf15_11"); + assertNotNull(lf15_11Augment); + final JsonPrimitive lf15_12Augment = childPrimitive(cont1, "complexjson-augmentation:lf15_12"); + assertNotNull(lf15_12Augment); + final JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13"); + assertNotNull(lf13); + final JsonPrimitive lf15_11 = childPrimitive(cont1, "complexjson:lf15_11", "lf15_11"); + assertNotNull(lf15_11); + final JsonPrimitive lf15_12 = childPrimitive(cont1, "complexjson:lf15_12", "lf15_12"); + assertNotNull(lf15_12); + + assertEquals("lf15_11 value from augmentation", lf15_11Augment.getAsString()); + assertEquals("lf15_12 value from augmentation", lf15_12Augment.getAsString()); + assertEquals("lf13 value", lf13.getAsString()); + assertTrue("one two".equals(lf15_11.getAsString()) || "two one".equals(lf15_11.getAsString())); + assertEquals("complexjson:lf11", lf15_12.getAsString()); + + }).validate(jsonOutput); } /** @@ -344,18 +312,14 @@ public class NormalizedNodeToJsonStreamTest { final NormalizedNode choiceNodeAugmentationInContainer = TestingNormalizedNodeStructuresCreator .choiceNodeAugmentationInContainer(); final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, choiceNodeAugmentationInContainer); - new JsonValidator() { - - @Override - public void validate(final String jsonOutput) { - final JsonObject cont1 = resolveCont1(jsonOutput); - assertNotNull(cont1); - - final JsonPrimitive lf17 = childPrimitive(cont1, "complexjson:lf17", "lf17"); - assertNotNull(lf17); - assertEquals("lf17 value", lf17.getAsString()); - } - }.validate(jsonOutput); + ((JsonValidator) jsonOutput1 -> { + final JsonObject cont1 = resolveCont1(jsonOutput1); + assertNotNull(cont1); + + final JsonPrimitive lf17 = childPrimitive(cont1, "complexjson:lf17", "lf17"); + assertNotNull(lf17); + assertEquals("lf17 value", lf17.getAsString()); + }).validate(jsonOutput); } @Test @@ -364,30 +328,26 @@ public class NormalizedNodeToJsonStreamTest { final NormalizedNode unkeyedNodeInContainer = TestingNormalizedNodeStructuresCreator .unkeyedNodeInContainer(); final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, unkeyedNodeInContainer); - new JsonValidator() { + ((JsonValidator) jsonOutput1 -> { + final JsonObject cont1 = resolveCont1(jsonOutput1); + assertNotNull(cont1); - @Override - public void validate(final String jsonOutput) { - final JsonObject cont1 = resolveCont1(jsonOutput); - assertNotNull(cont1); + final JsonArray lst12 = childArray(cont1, "complexjson:lst12", "lst12"); + assertNotNull(lst12); - final JsonArray lst12 = childArray(cont1, "complexjson:lst12", "lst12"); - assertNotNull(lst12); + final Iterator iterator = lst12.iterator(); + assertTrue(iterator.hasNext()); + final JsonElement lst12Entry1Raw = iterator.next(); + assertFalse(iterator.hasNext()); - final Iterator iterator = lst12.iterator(); - assertTrue(iterator.hasNext()); - final JsonElement lst12Entry1Raw = iterator.next(); - assertFalse(iterator.hasNext()); + assertTrue(lst12Entry1Raw instanceof JsonObject); + final JsonObject lst12Entry1 = (JsonObject) lst12Entry1Raw; + final JsonPrimitive lf121 = childPrimitive(lst12Entry1, "complexjson:lf121", "lf121"); + assertNotNull(lf121); - assertTrue(lst12Entry1Raw instanceof JsonObject); - final JsonObject lst12Entry1 = (JsonObject) lst12Entry1Raw; - final JsonPrimitive lf121 = childPrimitive(lst12Entry1, "complexjson:lf121", "lf121"); - assertNotNull(lf121); + assertEquals("lf121 value", lf121.getAsString()); - assertEquals("lf121 value", lf121.getAsString()); - - } - }.validate(jsonOutput); + }).validate(jsonOutput); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlUtils.java index d3acbe6440..82a8b923b2 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlUtils.java @@ -16,12 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; * JAXP API. */ public final class XmlUtils { - public static final XmlCodecProvider DEFAULT_XML_CODEC_PROVIDER = new XmlCodecProvider() { - @Override - public TypeDefinitionAwareCodec> codecFor(final TypeDefinition baseType) { - return TypeDefinitionAwareCodec.from(baseType); - } - }; + public static final XmlCodecProvider DEFAULT_XML_CODEC_PROVIDER = + TypeDefinitionAwareCodec::from; private XmlUtils() { throw new UnsupportedOperationException(); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java index ff8aa82a23..84f17d195d 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -238,35 +238,30 @@ public abstract class LeafRefPath implements Immutable { * the schema node towards the root. */ public Iterable getPathTowardsRoot() { - return new Iterable() { + return () -> new Iterator() { + private LeafRefPath current = LeafRefPath.this; + + @Override + public boolean hasNext() { + return current.parent != null; + } + + @Override + public QNameWithPredicate next() { + if (current.parent != null) { + final QNameWithPredicate ret = current.qname; + current = current.parent; + return ret; + } else { + throw new NoSuchElementException( + "No more elements available"); + } + } + @Override - public Iterator iterator() { - return new Iterator() { - private LeafRefPath current = LeafRefPath.this; - - @Override - public boolean hasNext() { - return current.parent != null; - } - - @Override - public QNameWithPredicate next() { - if (current.parent != null) { - final QNameWithPredicate ret = current.qname; - current = current.parent; - return ret; - } else { - throw new NoSuchElementException( - "No more elements available"); - } - } - - @Override - public void remove() { - throw new UnsupportedOperationException( - "Component removal not supported"); - } - }; + public void remove() { + throw new UnsupportedOperationException( + "Component removal not supported"); } }; } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/DomSerializerTestUtils.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/DomSerializerTestUtils.java index 6ef48d97f4..0950a1ab12 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/DomSerializerTestUtils.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/DomSerializerTestUtils.java @@ -30,7 +30,6 @@ import org.opendaylight.yangtools.yang.data.impl.codec.xml.XmlCodecProvider; import org.opendaylight.yangtools.yang.data.impl.codec.xml.XmlDocumentUtils; import org.opendaylight.yangtools.yang.data.impl.schema.transform.base.serializer.NodeSerializerDispatcher; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; @@ -43,12 +42,7 @@ public class DomSerializerTestUtils { static final Document DOC = XmlDocumentUtils.getDocument(); static final Element DATA = DOC.createElement("data"); static final NodeSerializerDispatcher MOCK_DISPATCHER = Mockito.mock(NodeSerializerDispatcher.class); - static final XmlCodecProvider CODEC_PROVIDER = new XmlCodecProvider() { - @Override - public TypeDefinitionAwareCodec> codecFor(TypeDefinition baseType) { - return TypeDefinitionAwareCodec.from(baseType); - } - }; + static final XmlCodecProvider CODEC_PROVIDER = TypeDefinitionAwareCodec::from; private DomSerializerTestUtils() { throw new UnsupportedOperationException("Utility class"); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java index e1f02a76a9..7d3be418b0 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java @@ -11,7 +11,6 @@ import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.augmenta import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.choiceBuilder; import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.containerBuilder; import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.leafNode; -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; @@ -273,13 +272,10 @@ public class NormalizedNodeXmlTranslationTest { List getTestYangs(final String... yangPaths) { return Lists.newArrayList(Collections2.transform(Lists.newArrayList(yangPaths), - new Function() { - @Override - public InputStream apply(final String input) { - final InputStream resourceAsStream = NormalizedDataBuilderTest.class.getResourceAsStream(input); - Preconditions.checkNotNull(resourceAsStream, "File %s was null", resourceAsStream); - return resourceAsStream; - } + input -> { + final InputStream resourceAsStream = NormalizedDataBuilderTest.class.getResourceAsStream(input); + Preconditions.checkNotNull(resourceAsStream, "File %s was null", resourceAsStream); + return resourceAsStream; })); } diff --git a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenXPath.java b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenXPath.java index 331d80ddeb..11e8662c7a 100644 --- a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenXPath.java +++ b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/JaxenXPath.java @@ -11,7 +11,6 @@ import com.google.common.base.Converter; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import java.util.Collection; import java.util.List; import javax.xml.xpath.XPathExpressionException; import org.jaxen.BaseXPath; @@ -20,7 +19,6 @@ import org.jaxen.JaxenException; import org.jaxen.expr.Expr; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.xpath.XPathBooleanResult; import org.opendaylight.yangtools.yang.data.api.schema.xpath.XPathDocument; import org.opendaylight.yangtools.yang.data.api.schema.xpath.XPathExpression; @@ -83,34 +81,15 @@ final class JaxenXPath implements XPathExpression { } if (result instanceof String) { - return Optional.of(new XPathStringResult() { - @Override - public String getValue() { - return (String)result; - } - }); + return Optional.of((XPathStringResult) () -> (String)result); } else if (result instanceof Number) { - return Optional.of(new XPathNumberResult() { - @Override - public Number getValue() { - return (Number) result; - } - }); + return Optional.of((XPathNumberResult) () -> (Number) result); } else if (result instanceof Boolean) { - return Optional.of(new XPathBooleanResult() { - @Override - public Boolean getValue() { - return (Boolean) result; - } - }); + return Optional.of((XPathBooleanResult) () -> (Boolean) result); } else if (result != null){ - return Optional.of(new XPathNodesetResult() { - @SuppressWarnings("unchecked") - @Override - public Collection> getValue() { - // XXX: Will this really work, or do we need to perform deep transformation? - return Lists.transform((List) result, NormalizedNodeContext::getNode); - } + return Optional.of((XPathNodesetResult) () -> { + // XXX: Will this really work, or do we need to perform deep transformation? + return Lists.transform((List) result, NormalizedNodeContext::getNode); }); } else { return Optional.absent(); diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java index a29ad42a46..939b0451ec 100644 --- a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java +++ b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java @@ -13,7 +13,6 @@ import com.google.common.collect.Maps; import java.io.Closeable; import java.io.File; import java.io.FileNotFoundException; -import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -275,12 +274,8 @@ final class Util { //FIXME: code duplicate File yangDir = new File(file, YangToSourcesProcessor.META_INF_YANG_STRING); if (yangDir.exists() && yangDir.isDirectory()) { - File[] yangFiles = yangDir.listFiles(new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.endsWith(".yang") && new File(dir, name).isFile(); - } - }); + File[] yangFiles = yangDir.listFiles( + (dir, name) -> name.endsWith(".yang") && new File(dir, name).isFile()); for (final File yangFile : yangFiles) { yangsFromDependencies.add(new YangSourceFromFile(yangFile)); } @@ -344,12 +339,8 @@ final class Util { //FIXME: code duplicate File yangDir = new File(file, YangToSourcesProcessor.META_INF_YANG_STRING); if (yangDir.exists() && yangDir.isDirectory()) { - File[] yangFiles = yangDir.listFiles(new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.endsWith(".yang") && new File(dir, name).isFile(); - } - }); + File[] yangFiles = yangDir.listFiles( + (dir, name) -> name.endsWith(".yang") && new File(dir, name).isFile()); yangsFilesFromDependencies.addAll(Arrays.asList(yangFiles)); } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java index ea629398f5..f894fc9b93 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/SchemaPath.java @@ -16,7 +16,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.UnmodifiableIterator; import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; import java.util.Objects; @@ -250,28 +249,23 @@ public abstract class SchemaPath implements Immutable { * path from the schema node towards the root. */ public Iterable getPathTowardsRoot() { - return new Iterable() { + return () -> new UnmodifiableIterator() { + private SchemaPath current = SchemaPath.this; + + @Override + public boolean hasNext() { + return current.parent != null; + } + @Override - public Iterator iterator() { - return new UnmodifiableIterator() { - private SchemaPath current = SchemaPath.this; - - @Override - public boolean hasNext() { - return current.parent != null; - } - - @Override - public QName next() { - if (current.parent != null) { - final QName ret = current.qname; - current = current.parent; - return ret; - } else { - throw new NoSuchElementException("No more elements available"); - } - } - }; + public QName next() { + if (current.parent != null) { + final QName ret = current.qname; + current = current.parent; + return ret; + } else { + throw new NoSuchElementException("No more elements available"); + } } }; } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java index 50740270d0..4a62363007 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java @@ -14,7 +14,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.UnmodifiableIterator; import java.util.Arrays; -import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Objects; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; @@ -237,28 +236,23 @@ public abstract class SchemaNodeIdentifier implements Immutable { * path from the schema node towards the root. */ public Iterable getPathTowardsRoot() { - return new Iterable() { + return () -> new UnmodifiableIterator() { + private SchemaNodeIdentifier current = SchemaNodeIdentifier.this; + + @Override + public boolean hasNext() { + return current.parent != null; + } + @Override - public Iterator iterator() { - return new UnmodifiableIterator() { - private SchemaNodeIdentifier current = SchemaNodeIdentifier.this; - - @Override - public boolean hasNext() { - return current.parent != null; - } - - @Override - public QName next() { - if (current.parent != null) { - final QName ret = current.qname; - current = current.parent; - return ret; - } else { - throw new NoSuchElementException("No more elements available"); - } - } - }; + public QName next() { + if (current.parent != null) { + final QName ret = current.qname; + current = current.parent; + return ret; + } else { + throw new NoSuchElementException("No more elements available"); + } } }; } diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/StmtTestUtils.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/StmtTestUtils.java index fd1bb7448c..1231e7832d 100644 --- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/StmtTestUtils.java +++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/StmtTestUtils.java @@ -24,12 +24,9 @@ import org.opendaylight.yangtools.yang.parser.util.NamedFileInputStream; final class StmtTestUtils { - final static FileFilter YANG_FILE_FILTER = new FileFilter() { - @Override - public boolean accept(File file) { - String name = file.getName().toLowerCase(); - return name.endsWith(".yang") && file.isFile(); - } + final static FileFilter YANG_FILE_FILTER = file -> { + String name = file.getName().toLowerCase(); + return name.endsWith(".yang") && file.isFile(); }; private StmtTestUtils() { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java index 49a2e13ff0..5274352a78 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java @@ -99,7 +99,7 @@ public final class FilteringSchemaContextProxy extends AbstractSchemaContext { } private static TreeMultimap getStringModuleTreeMultimap() { - return TreeMultimap.create((o1, o2) -> o1.compareTo(o2), REVISION_COMPARATOR); + return TreeMultimap.create(String::compareTo, REVISION_COMPARATOR); } private static void processForAdditionalModules(final SchemaContext delegate, diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java index ec956dbb98..a094f91f14 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.verify; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; -import com.google.common.base.Function; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.collect.Collections2; @@ -98,12 +97,7 @@ public class FilesystemSchemaSourceCacheTest { } private static Collection filesToFilenamesWithoutRevision(final List storedFiles) { - return Collections2.transform(storedFiles, new Function() { - @Override - public String apply(final File input) { - return Files.getNameWithoutExtension(input.getName()); - } - }); + return Collections2.transform(storedFiles, input -> Files.getNameWithoutExtension(input.getName())); } @Test diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java index 74fdd97c24..d4a8219627 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ChoiceEffectiveStatementImpl.java @@ -39,9 +39,7 @@ public final class ChoiceEffectiveStatementImpl extends AbstractEffectiveDataSch * Comparator based on alphabetical order of local name of SchemaNode's * qname. */ - private static final Comparator SCHEMA_NODE_COMP = (o1, o2) -> { - return o1.getQName().compareTo(o2.getQName()); - }; + private static final Comparator SCHEMA_NODE_COMP = (o1, o2) -> o1.getQName().compareTo(o2.getQName()); private final ChoiceSchemaNode original; private final String defaultCase; diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java index 2a2fd60f11..f9dff88863 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java @@ -242,12 +242,8 @@ public class SharedSchemaRepositoryTest { assertEquals(4, listener.registeredSources.size()); - final Function, SourceIdentifier> potSourceToSID = new Function, SourceIdentifier>() { - @Override - public SourceIdentifier apply(final PotentialSchemaSource input) { - return input.getSourceIdentifier(); - } - }; + final Function, SourceIdentifier> potSourceToSID = + PotentialSchemaSource::getSourceIdentifier; assertThat(Collections2.transform(listener.registeredSources, potSourceToSID), both(hasItem(RevisionSourceIdentifier.create("test", Optional.absent()))) .and(hasItem(RevisionSourceIdentifier.create("test", Optional.of("2012-12-12")))) diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java index 87b6176750..5ee2476471 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java @@ -36,20 +36,14 @@ import org.slf4j.LoggerFactory; public class StmtTestUtils { - final public static FileFilter YANG_FILE_FILTER = new FileFilter() { - @Override - public boolean accept(File file) { - String name = file.getName().toLowerCase(); - return name.endsWith(".yang") && file.isFile(); - } + final public static FileFilter YANG_FILE_FILTER = file -> { + String name = file.getName().toLowerCase(); + return name.endsWith(".yang") && file.isFile(); }; - final public static FileFilter YIN_FILE_FILTER = new FileFilter() { - @Override - public boolean accept(File file) { - String name = file.getName().toLowerCase(); - return name.endsWith(".xml") && file.isFile(); - } + final public static FileFilter YIN_FILE_FILTER = file -> { + String name = file.getName().toLowerCase(); + return name.endsWith(".xml") && file.isFile(); }; private static final Logger LOG = LoggerFactory.getLogger(StmtTestUtils.class);