From 6b5d20f6513bc3e6e5db4a2058ee81308edaa9c8 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Wed, 13 Apr 2016 17:03:25 +0200 Subject: [PATCH] Drop unneeded generic type specifiers Change-Id: Ifd28a6dda26da901925970ae86dc8c4c1a5bd4ee Signed-off-by: Stephen Kitt --- .../yangtools/util/ClassLoaderUtils.java | 2 +- .../yangtools/util/Immutables.java | 2 +- .../yangtools/util/ListenerRegistry.java | 4 ++-- .../yangtools/util/MutableOffsetMap.java | 14 ++++++------- .../yangtools/util/ReadWriteTrieMap.java | 2 +- .../yangtools/util/SharedSingletonMap.java | 2 +- .../yangtools/util/SingletonSet.java | 2 +- .../util/UnmodifiableCollection.java | 2 +- .../AsyncNotifyingListenableFutureTask.java | 8 ++++---- .../concurrent/FastThreadPoolExecutor.java | 2 +- .../util/concurrent/MappingCheckedFuture.java | 2 +- .../yangtools/util/OffsetMapTest.java | 2 +- .../yangtools/util/ReadWriteTrieMapTest.java | 4 ++-- .../CountingRejectedExecutionHandlerTest.java | 4 ++-- .../QueuedNotificationManagerTest.java | 20 +++++++++---------- .../websocket/WebSocketClientTest.java | 2 +- .../websocket/server/WebSocketServer.java | 2 +- .../yang/common/OperationFailedException.java | 2 +- .../yang/common/RpcResultBuilder.java | 16 +++++++-------- .../yang/common/RpcResultBuilderTest.java | 4 ++-- .../data/api/FixedYangInstanceIdentifier.java | 2 +- .../yang/data/api/schema/NormalizedNodes.java | 4 ++-- .../NormalizedNodeDataTreeCandidateNode.java | 2 +- .../data/api/schema/tree/StoreTreeNodes.java | 12 +++++------ .../data/api/YangInstanceIdentifierTest.java | 2 +- .../yang/data/codec/gson/TestUtils.java | 2 +- .../data/codec/gson/retest/TestUtils.java | 2 +- .../data/impl/codec/EmptyStringCodec.java | 2 +- .../data/impl/codec/xml/XmlDocumentUtils.java | 2 +- .../data/impl/codec/xml/XmlStreamUtils.java | 6 +++--- .../impl/codec/xml/retest/XmlStreamUtils.java | 6 +++--- .../leafref/LeafRefContextTreeBuilder.java | 4 ++-- .../impl/leafref/LeafRefContextUtils.java | 6 +++--- .../LeafRefPathParserListenerImpl.java | 4 ++-- .../yang/data/impl/schema/Builders.java | 6 +++--- .../yang/data/impl/schema/ImmutableNodes.java | 4 ++-- .../schema/InstanceIdToCompositeNodes.java | 2 +- .../yang/data/impl/schema/SchemaUtils.java | 6 +++--- .../impl/ImmutableLeafSetNodeBuilder.java | 4 ++-- ...mmutableLeafSetNodeSchemaAwareBuilder.java | 2 +- .../ImmutableOrderedLeafSetNodeBuilder.java | 4 ++-- ...eOrderedLeafSetNodeSchemaAwareBuilder.java | 2 +- .../AbstractImmutableDataContainerNode.java | 2 +- .../base/parser/ListNodeBaseParser.java | 2 +- .../tree/AbstractDataTreeCandidateNode.java | 4 ++-- .../impl/schema/tree/AbstractDataTreeTip.java | 2 +- .../tree/AbstractLeafCandidateNode.java | 2 +- ...bstractModifiedNodeBasedCandidateNode.java | 4 ++-- .../tree/InMemoryDataTreeModification.java | 2 +- .../data/impl/schema/tree/ModifiedNode.java | 2 +- .../OrderedLeafSetModificationStrategy.java | 2 +- .../tree/OrderedMapModificationStrategy.java | 2 +- .../tree/RecursiveReplaceCandidateNode.java | 2 +- .../schema/tree/ReplaceLeafCandidateNode.java | 2 +- .../tree/SchemaAwareApplyOperation.java | 2 +- .../tree/UnkeyedListModificationStrategy.java | 2 +- .../UnorderedLeafSetModificationStrategy.java | 2 +- .../UnorderedMapModificationStrategy.java | 2 +- .../impl/codec/xml/XmlStreamUtilsTest.java | 2 +- .../codec/xml/retest/XmlStreamUtilsTest.java | 2 +- .../test/DataTreeCandidateValidatorTest.java | 4 ++-- .../DataTreeCandidateValidatorTest.java | 4 ++-- .../data/impl/schema/test/BuilderTest.java | 2 +- .../impl/test/codecs/BitsCodecStringTest.java | 2 +- .../TypeDefinitionAwareCodecTestHelper.java | 2 +- .../util/UnorderedMapMixinContextNode.java | 2 +- .../repo/api/SchemaResolutionException.java | 2 +- .../model/repo/api/SchemaSourceFilter.java | 2 +- .../model/repo/api/YangTextSchemaSource.java | 2 +- .../model/repo/api/YinTextSchemaSource.java | 2 +- .../model/export/test/SimpleModuleTest.java | 2 +- .../repo/util/AbstractSchemaRepository.java | 6 +++--- .../util/FilesystemSchemaSourceCache.java | 4 ++-- .../repo/util/InMemorySchemaSourceCache.java | 4 ++-- .../model/util/AbstractSchemaContext.java | 2 +- .../yangtools/yang/model/util/BaseTypes.java | 2 +- .../util/FilteringSchemaContextProxy.java | 4 ++-- .../yang/model/util/SchemaContextUtil.java | 2 +- .../model/util/type/AbstractBaseType.java | 2 +- .../util/type/AbstractRangedBaseType.java | 4 ++-- .../yang/model/util/type/BaseDecimalType.java | 2 +- .../util/type/JavaLengthConstraints.java | 2 +- .../util/SchemaSourceTransformerTest.java | 9 +++++---- .../model/util/MustDefinitionImplTest.java | 4 ++-- .../parser/builder/impl/BuilderUtils.java | 6 +++--- .../parser/builder/impl/ChoiceBuilder.java | 2 +- .../parser/builder/impl/ModuleBuilder.java | 2 +- .../yang/parser/builder/impl/ModuleImpl.java | 4 ++-- .../yang/parser/impl/ParserListenerUtils.java | 4 ++-- .../yang/parser/impl/SchemaContextImpl.java | 4 ++-- .../yang/parser/impl/YangParserImpl.java | 6 +++--- .../yang/parser/repo/DependencyResolver.java | 2 +- .../repo/YangTextSchemaContextResolver.java | 6 +++--- .../spi/meta/StatementSupportBundle.java | 2 +- .../parser/stmt/reactor/ModifierImpl.java | 20 +++++++++---------- .../stmt/rfc6020/BelongsToStatementImpl.java | 2 +- .../rfc6020/ImportStatementDefinition.java | 4 ++-- .../stmt/rfc6020/IncludeStatementImpl.java | 2 +- .../stmt/rfc6020/ModuleStatementSupport.java | 2 +- .../stmt/rfc6020/PatternStatementImpl.java | 2 +- .../stmt/rfc6020/SubmoduleStatementImpl.java | 2 +- .../stmt/rfc6020/YangValidationBundles.java | 20 +++++++++---------- .../AbstractEffectiveSchemaContext.java | 2 +- .../effective/EffectiveSchemaContext.java | 8 ++++---- .../IdentityEffectiveStatementImpl.java | 2 +- .../parser/util/ModuleDependencySort.java | 6 +++--- .../parser/builder/impl/BuilderUtilsTest.java | 2 +- .../parser/impl/YangModelValidationTest.java | 2 +- .../yang/parser/impl/YangParserTest.java | 14 ++++++------- .../repo/SharedSchemaContextFactoryTest.java | 4 ++-- .../repo/SharedSchemaRepositoryTest.java | 4 ++-- .../parser/util/ModuleDependencySortTest.java | 2 +- 112 files changed, 218 insertions(+), 217 deletions(-) diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java index f258cf839d..41f0c9b472 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java @@ -149,7 +149,7 @@ public final class ClassLoaderUtils { } public static Class

findFirstGenericArgument(final Class scannedClass, final Class genericType) { - return withClassLoader(scannedClass.getClassLoader(), ClassLoaderUtils.findFirstGenericArgumentTask(scannedClass, genericType)); + return withClassLoader(scannedClass.getClassLoader(), ClassLoaderUtils.findFirstGenericArgumentTask(scannedClass, genericType)); } private static Supplier> findFirstGenericArgumentTask(final Class scannedClass, final Class genericType) { diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/Immutables.java b/common/util/src/main/java/org/opendaylight/yangtools/util/Immutables.java index 3d3f02b4b0..73e254abe7 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/Immutables.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/Immutables.java @@ -21,7 +21,7 @@ public final class Immutables { throw new UnsupportedOperationException("Helper class"); } - public static final Set> KNOWN_IMMUTABLES = ImmutableSet.>of( + public static final Set> KNOWN_IMMUTABLES = ImmutableSet.of( Integer.class, Short.class, BigDecimal.class, BigInteger.class, Byte.class, Character.class, Double.class, Float.class, String.class, Boolean.class, Void.class); diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ListenerRegistry.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ListenerRegistry.java index 38868cbc0f..32876f6885 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/ListenerRegistry.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ListenerRegistry.java @@ -39,13 +39,13 @@ public class ListenerRegistry implements Iterable ret = new ListenerRegistrationImpl(listener); + final ListenerRegistrationImpl ret = new ListenerRegistrationImpl<>(listener); listeners.put(ret,ret); return ret; } public ListenerRegistration registerWithType(final L listener) { - final ListenerRegistrationImpl ret = new ListenerRegistrationImpl(listener); + final ListenerRegistrationImpl ret = new ListenerRegistrationImpl<>(listener); listeners.put(ret,ret); return ret; } diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java index 45798d622b..dee904fbe7 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java @@ -44,15 +44,15 @@ import java.util.Set; public abstract class MutableOffsetMap extends AbstractMap implements Cloneable, ModifiableMapPhase { static final class Ordered extends MutableOffsetMap { Ordered() { - super(new LinkedHashMap()); + super(new LinkedHashMap<>()); } Ordered(final Map source) { - super(OffsetMapCache.orderedOffsets(source.keySet()), source, new LinkedHashMap()); + super(OffsetMapCache.orderedOffsets(source.keySet()), source, new LinkedHashMap<>()); } Ordered(final Map offsets, final V[] objects) { - super(offsets, objects, new LinkedHashMap()); + super(offsets, objects, new LinkedHashMap<>()); } @Override @@ -78,15 +78,15 @@ public abstract class MutableOffsetMap extends AbstractMap implement static final class Unordered extends MutableOffsetMap { Unordered() { - super(new HashMap()); + super(new HashMap<>()); } Unordered(final Map source) { - super(OffsetMapCache.unorderedOffsets(source.keySet()), source, new HashMap()); + super(OffsetMapCache.unorderedOffsets(source.keySet()), source, new HashMap<>()); } Unordered(final Map offsets, final V[] objects) { - super(offsets, objects, new HashMap()); + super(offsets, objects, new HashMap<>()); } @Override @@ -129,7 +129,7 @@ public abstract class MutableOffsetMap extends AbstractMap implement @SuppressWarnings("unchecked") MutableOffsetMap(final HashMap newKeys) { - this(ImmutableMap.of(), (V[]) EMPTY_ARRAY, newKeys); + this(ImmutableMap.of(), (V[]) EMPTY_ARRAY, newKeys); } @SuppressWarnings("unchecked") diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ReadWriteTrieMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ReadWriteTrieMap.java index 99cb628f89..f860a7b464 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/ReadWriteTrieMap.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ReadWriteTrieMap.java @@ -33,7 +33,7 @@ final class ReadWriteTrieMap implements Map { private int size; ReadWriteTrieMap() { - this.delegate = new TrieMap(); + this.delegate = new TrieMap<>(); this.size = 0; } diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java index 6295e182e9..e8366120dd 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java @@ -93,7 +93,7 @@ public abstract class SharedSingletonMap implements Serializable, Unmodifi @Override public final SingletonSet> entrySet() { - return SingletonSet.>of(new SimpleImmutableEntry<>(keySet.getElement(), value)); + return SingletonSet.of(new SimpleImmutableEntry<>(keySet.getElement(), value)); } @Override diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java b/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java index 9587d1104e..8f03693132 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java @@ -58,7 +58,7 @@ public abstract class SingletonSet implements Set, Immutable, Serializable if (element == null) { return (SingletonSet) NULL_SINGLETON; } - return new RegularSingletonSet(element); + return new RegularSingletonSet<>(element); } public abstract E getElement(); diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/UnmodifiableCollection.java b/common/util/src/main/java/org/opendaylight/yangtools/util/UnmodifiableCollection.java index e99659d286..ca6415f0e3 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/UnmodifiableCollection.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/UnmodifiableCollection.java @@ -37,7 +37,7 @@ public final class UnmodifiableCollection implements Collection, Serializa private static final Collection> SINGLETON_CLASSES; static { - UNMODIFIABLE_COLLECTION_CLASS = Collections.unmodifiableCollection(new ArrayList()).getClass(); + UNMODIFIABLE_COLLECTION_CLASS = Collections.unmodifiableCollection(new ArrayList<>()).getClass(); final Builder> b = ImmutableSet.builder(); b.add(Collections.singleton(null).getClass()); diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListenableFutureTask.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListenableFutureTask.java index f77a99895e..bd0919aecf 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListenableFutureTask.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListenableFutureTask.java @@ -133,9 +133,9 @@ public class AsyncNotifyingListenableFutureTask extends FutureTask impleme public static AsyncNotifyingListenableFutureTask create(final Callable callable, @Nullable final Executor listenerExecutor) { if (listenerExecutor != null) { - return new DelegatingAsyncNotifyingListenableFutureTask(callable, listenerExecutor); + return new DelegatingAsyncNotifyingListenableFutureTask<>(callable, listenerExecutor); } else { - return new AsyncNotifyingListenableFutureTask(callable); + return new AsyncNotifyingListenableFutureTask<>(callable); } } @@ -152,9 +152,9 @@ public class AsyncNotifyingListenableFutureTask extends FutureTask impleme public static AsyncNotifyingListenableFutureTask create(final Runnable runnable, @Nullable final V result, @Nullable final Executor listenerExecutor) { if (listenerExecutor != null) { - return new DelegatingAsyncNotifyingListenableFutureTask(runnable, result, listenerExecutor); + return new DelegatingAsyncNotifyingListenableFutureTask<>(runnable, result, listenerExecutor); } else { - return new AsyncNotifyingListenableFutureTask(runnable, result); + return new AsyncNotifyingListenableFutureTask<>(runnable, result); } } diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/FastThreadPoolExecutor.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/FastThreadPoolExecutor.java index 77a5846419..f46dcbcd5c 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/FastThreadPoolExecutor.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/FastThreadPoolExecutor.java @@ -68,7 +68,7 @@ public class FastThreadPoolExecutor extends ThreadPoolExecutor { // reached, subsequent tasks will be queued. If the queue is full, tasks will be rejected. super( maximumPoolSize, maximumPoolSize, keepAliveTime, unit, - new TrackingLinkedBlockingQueue( maximumQueueSize ) ); + new TrackingLinkedBlockingQueue<>(maximumQueueSize) ); this.threadPrefix = threadPrefix; this.maximumQueueSize = maximumQueueSize; diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFuture.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFuture.java index 62385fdbc5..571411d24f 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFuture.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFuture.java @@ -51,7 +51,7 @@ public final class MappingCheckedFuture extends Abstract */ public static MappingCheckedFuture create( final ListenableFuture delegate, final Function mapper ) { - return new MappingCheckedFuture( delegate, mapper ); + return new MappingCheckedFuture<>(delegate, mapper); } @Override diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/OffsetMapTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/OffsetMapTest.java index fad44069e5..bcd5da6367 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/OffsetMapTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/OffsetMapTest.java @@ -52,7 +52,7 @@ public class OffsetMapTest { @Test(expected=IllegalArgumentException.class) public void testWrongImmutableConstruction() { - new ImmutableOffsetMap.Ordered(Collections.emptyMap(), new String[1]); + new ImmutableOffsetMap.Ordered<>(Collections.emptyMap(), new String[1]); } @Test diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/ReadWriteTrieMapTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/ReadWriteTrieMapTest.java index 3389ccb172..f0d1ec8de9 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/ReadWriteTrieMapTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/ReadWriteTrieMapTest.java @@ -28,7 +28,7 @@ public class ReadWriteTrieMapTest { trieMap.put("0", "zero"); trieMap.put("1", "one"); - final ReadWriteTrieMap readWriteTrieMap = new ReadWriteTrieMap(trieMap, 5); + final ReadWriteTrieMap readWriteTrieMap = new ReadWriteTrieMap<>(trieMap, 5); assertNotNull("Object readOnlyTrieMap shouldn't be 'null'.", readWriteTrieMap); @@ -54,7 +54,7 @@ public class ReadWriteTrieMapTest { assertTrue("Entry set of readWriteTrieMap and trieMap should by equals.", convertSetEntryToMap(readWriteTrieMap.entrySet()).equals(trieMap)); trieMap.put("2", "two"); - final ReadWriteTrieMap readWriteTrieMap2 = new ReadWriteTrieMap(trieMap, 4); + final ReadWriteTrieMap readWriteTrieMap2 = new ReadWriteTrieMap<>(trieMap, 4); assertFalse("Objects readWriteTrieMap and readOnlyTrieMap2 should be different.", readWriteTrieMap.equals(readWriteTrieMap2)); assertFalse("Hash codes of object readWriteTrieMap and readOnelyTrieMap2 should be different.", readWriteTrieMap.hashCode() == readWriteTrieMap2.hashCode()); diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CountingRejectedExecutionHandlerTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CountingRejectedExecutionHandlerTest.java index 42c939ab34..8c45dc25bb 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CountingRejectedExecutionHandlerTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CountingRejectedExecutionHandlerTest.java @@ -46,7 +46,7 @@ public class CountingRejectedExecutionHandlerTest { CountDownLatch blockLatch = new CountDownLatch( 1 ); executor = new ThreadPoolExecutor( 1, 1, 0, TimeUnit.SECONDS, - ExecutorServiceUtil.offerFailingBlockingQueue( new LinkedBlockingQueue() ) ); + ExecutorServiceUtil.offerFailingBlockingQueue(new LinkedBlockingQueue<>() ) ); CountingRejectedExecutionHandler countingHandler = CountingRejectedExecutionHandler.newCallerRunsPolicy(); @@ -73,7 +73,7 @@ public class CountingRejectedExecutionHandlerTest { CountDownLatch blockLatch = new CountDownLatch( 1 ); executor = new ThreadPoolExecutor( 1, 1, 0, TimeUnit.SECONDS, - ExecutorServiceUtil.offerFailingBlockingQueue( new LinkedBlockingQueue() ) ); + ExecutorServiceUtil.offerFailingBlockingQueue(new LinkedBlockingQueue<>() ) ); CountingRejectedExecutionHandler countingHandler = CountingRejectedExecutionHandler.newAbortPolicy(); diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerTest.java index 7cc028a9f0..455ccdd1b0 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerTest.java @@ -48,7 +48,7 @@ public class QueuedNotificationManagerTest { TestListener( int expCount, int id ) { name = "TestListener " + id; - actual = Collections.synchronizedList( Lists.newArrayListWithCapacity( expCount ) ); + actual = Collections.synchronizedList( Lists.newArrayListWithCapacity( expCount ) ); reset( expCount ); } @@ -148,7 +148,7 @@ public class QueuedNotificationManagerTest { queueExecutor = Executors.newFixedThreadPool( 2 ); NotificationManager, Integer> manager = - new QueuedNotificationManager<>( queueExecutor, new TestNotifier(), + new QueuedNotificationManager<>( queueExecutor, new TestNotifier<>(), 10, "TestMgr" ); int initialCount = 6; @@ -162,7 +162,7 @@ public class QueuedNotificationManagerTest { manager.submitNotifications( listener, Arrays.asList( 4, 5 ) ); manager.submitNotification( listener, 6 ); - manager.submitNotifications( null, Collections.emptyList() ); + manager.submitNotifications( null, Collections.emptyList() ); manager.submitNotifications( listener, null ); manager.submitNotification( listener, null ); @@ -188,7 +188,7 @@ public class QueuedNotificationManagerTest { queueExecutor = Executors.newFixedThreadPool( nListeners ); final ExecutorService stagingExecutor = Executors.newFixedThreadPool( nListeners ); final NotificationManager, Integer> manager = - new QueuedNotificationManager<>( queueExecutor, new TestNotifier(), + new QueuedNotificationManager<>( queueExecutor, new TestNotifier<>(), 5000, "TestMgr" ); final int nNotifications = 100000; @@ -206,9 +206,9 @@ public class QueuedNotificationManagerTest { List> listeners = Lists.newArrayList(); for( int i = 1; i <= nListeners; i++ ) { final TestListener listener = - i == 2 ? new TestListener2( nNotifications, i ) : - i == 3 ? new TestListener3( nNotifications, i ) : - new TestListener( nNotifications, i ); + i == 2 ? new TestListener2<>(nNotifications, i) : + i == 3 ? new TestListener3<>(nNotifications, i) : + new TestListener<>(nNotifications, i); listeners.add( listener ); new Thread( new Runnable() { @@ -247,7 +247,7 @@ public class QueuedNotificationManagerTest { queueExecutor = Executors.newFixedThreadPool( 1 ); NotificationManager, Integer> manager = - new QueuedNotificationManager<>( queueExecutor, new TestNotifier(), + new QueuedNotificationManager<>( queueExecutor, new TestNotifier<>(), 10, "TestMgr" ); @@ -265,7 +265,7 @@ public class QueuedNotificationManagerTest { final CountDownLatch errorCaughtLatch = new CountDownLatch( 1 ); queueExecutor = new ThreadPoolExecutor( 1, 1, 0, TimeUnit.SECONDS, - new LinkedBlockingQueue() ) { + new LinkedBlockingQueue<>() ) { @Override public void execute( final Runnable command ) { super.execute( new Runnable() { @@ -282,7 +282,7 @@ public class QueuedNotificationManagerTest { }; NotificationManager, Integer> manager = - new QueuedNotificationManager<>( queueExecutor, new TestNotifier(), + new QueuedNotificationManager<>( queueExecutor, new TestNotifier<>(), 10, "TestMgr" ); TestListener listener = new TestListener<>( 2, 1 ); diff --git a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/WebSocketClientTest.java b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/WebSocketClientTest.java index a5bbb87b49..5718e5a8c5 100644 --- a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/WebSocketClientTest.java +++ b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/WebSocketClientTest.java @@ -36,7 +36,7 @@ public class WebSocketClientTest { /** * Tracks if the message from the server has been received */ - private SettableFuture messageReceived = SettableFuture.create(); + private SettableFuture messageReceived = SettableFuture.create(); /** * Tracks the port on which the server is listening diff --git a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServer.java b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServer.java index 8659eac92d..2ba02b7bce 100644 --- a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServer.java +++ b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServer.java @@ -71,7 +71,7 @@ public class WebSocketServer implements Runnable { public WebSocketServer(final int inPort) { this.inPort = inPort; - port = SettableFuture.create(); + port = SettableFuture.create(); } @Override diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/OperationFailedException.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/OperationFailedException.java index 55974a3f87..e47f315297 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/OperationFailedException.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/OperationFailedException.java @@ -50,7 +50,7 @@ public class OperationFailedException extends Exception { super(Preconditions.checkNotNull(message), cause); if (errors != null && errors.length > 0) { - errorList = ImmutableList.copyOf( Arrays.asList( errors ) ); + errorList = ImmutableList.copyOf( Arrays.asList( errors ) ); } else { // Add a default RpcError. errorList = ImmutableList.of(RpcResultBuilder.newError(ErrorType.APPLICATION, null, diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java index 690e29517d..7b5ef531c9 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java @@ -143,7 +143,7 @@ public final class RpcResultBuilder implements Builder> { * Returns a builder for a successful result. */ public static RpcResultBuilder success() { - return new RpcResultBuilder( true, null ); + return new RpcResultBuilder<>(true, null); } /** @@ -152,7 +152,7 @@ public final class RpcResultBuilder implements Builder> { * @param result the result value */ public static RpcResultBuilder success( final T result ) { - return new RpcResultBuilder( true, result ); + return new RpcResultBuilder<>(true, result); } /** @@ -168,7 +168,7 @@ public final class RpcResultBuilder implements Builder> { * Returns a builder for a failed result. */ public static RpcResultBuilder failed() { - return new RpcResultBuilder( false, null ); + return new RpcResultBuilder<>(false, null); } /** @@ -177,7 +177,7 @@ public final class RpcResultBuilder implements Builder> { * @param success true if successful, false otherwise. */ public static RpcResultBuilder status( final boolean success ) { - return new RpcResultBuilder( success, null ); + return new RpcResultBuilder<>(success, null); } /** @@ -186,7 +186,7 @@ public final class RpcResultBuilder implements Builder> { * @param other the other RpcResult. */ public static RpcResultBuilder from( final RpcResult other ) { - return new RpcResultBuilder( other.isSuccessful(), other.getResult() ) + return new RpcResultBuilder<>(other.isSuccessful(), other.getResult()) .withRpcErrors( other.getErrors() ); } @@ -290,7 +290,7 @@ public final class RpcResultBuilder implements Builder> { private void addError( final RpcError error ) { if (errors == null) { - errors = new ImmutableList.Builder(); + errors = new ImmutableList.Builder<>(); } errors.add( error ); @@ -409,8 +409,8 @@ public final class RpcResultBuilder implements Builder> { @Override public RpcResult build() { - return new RpcResultImpl( successful, result, - errors != null ? errors.build() : Collections.emptyList() ); + return new RpcResultImpl<>(successful, result, + errors != null ? errors.build() : Collections.emptyList()); } /** diff --git a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/RpcResultBuilderTest.java b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/RpcResultBuilderTest.java index 3b714a5b51..ef26846400 100644 --- a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/RpcResultBuilderTest.java +++ b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/RpcResultBuilderTest.java @@ -37,7 +37,7 @@ public class RpcResultBuilderTest { assertNotNull( "getErrors returned null", result.getErrors() ); assertEquals( "getErrors size", 0, result.getErrors().size() ); - result = RpcResultBuilder.success( "bar" ).build(); + result = RpcResultBuilder.success( "bar" ).build(); verifyRpcResult( result, true, "bar" ); } @@ -86,7 +86,7 @@ public class RpcResultBuilderTest { .withWarning( ErrorType.RPC, "in-use", "message", "my-app-tag", "my-info", cause ) .build(); - RpcResult copy = RpcResultBuilder.from( result ) + RpcResult copy = RpcResultBuilder.from( result ) .withError( ErrorType.PROTOCOL, "error message" ) .build(); verifyRpcResult( copy, true, "foo" ); diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/FixedYangInstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/FixedYangInstanceIdentifier.java index 59f58c09e4..39afcacba2 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/FixedYangInstanceIdentifier.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/FixedYangInstanceIdentifier.java @@ -14,7 +14,7 @@ import java.util.List; import org.opendaylight.yangtools.util.HashCodeBuilder; final class FixedYangInstanceIdentifier extends YangInstanceIdentifier implements Cloneable { - static final FixedYangInstanceIdentifier EMPTY_INSTANCE = new FixedYangInstanceIdentifier(ImmutableList.of(), new HashCodeBuilder<>().build()); + static final FixedYangInstanceIdentifier EMPTY_INSTANCE = new FixedYangInstanceIdentifier(ImmutableList.of(), new HashCodeBuilder<>().build()); private static final long serialVersionUID = 1L; private final ImmutableList path; private transient volatile YangInstanceIdentifier parent; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java index 835855f45e..fb9b261e5d 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java @@ -66,7 +66,7 @@ public final class NormalizedNodes { } public static Optional> findNode(final NormalizedNode parent, final Iterable relativePath) { - return findNode(Optional.>fromNullable(parent), relativePath); + return findNode(Optional.fromNullable(parent), relativePath); } public static Optional> findNode(final NormalizedNode parent, final PathArgument... relativePath) { @@ -77,7 +77,7 @@ public final class NormalizedNodes { checkNotNull(tree, "Tree must not be null"); checkNotNull(path, "Path must not be null"); - return findNode(Optional.>of(tree), path.getPathArguments()); + return findNode(Optional.of(tree), path.getPathArguments()); } @SuppressWarnings({ "unchecked", "rawtypes" }) diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNode.java index 59424a4fc2..f471e858ff 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNode.java @@ -76,7 +76,7 @@ final class NormalizedNodeDataTreeCandidateNode implements DataTreeCandidateNode @Override public Optional> getDataAfter() { - return Optional.>of(data); + return Optional.of(data); } @Override diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/StoreTreeNodes.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/StoreTreeNodes.java index a7a15385a9..0fb94c54ac 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/StoreTreeNodes.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/StoreTreeNodes.java @@ -36,7 +36,7 @@ public final class StoreTreeNodes { * @return Optional with node if the node is present in tree, {@link Optional#absent()} otherwise. */ public static > Optional findNode(final T tree, final YangInstanceIdentifier path) { - Optional current = Optional. of(tree); + Optional current = Optional.of(tree); Iterator pathIter = path.getPathArguments().iterator(); while (current.isPresent() && pathIter.hasNext()) { current = current.get().getChild(pathIter.next()); @@ -71,13 +71,13 @@ public final class StoreTreeNodes { */ public static > Entry findClosest(final T tree, final YangInstanceIdentifier path) { - return findClosestsOrFirstMatch(tree, path, Predicates.alwaysFalse()); + return findClosestsOrFirstMatch(tree, path, Predicates.alwaysFalse()); } public static > Entry findClosestsOrFirstMatch(final T tree, final YangInstanceIdentifier path, final Predicate predicate) { - Optional parent = Optional.of(tree); - Optional current = Optional. of(tree); + Optional parent = Optional.of(tree); + Optional current = Optional.of(tree); int nesting = 0; Iterator pathIter = path.getPathArguments().iterator(); @@ -88,7 +88,7 @@ public final class StoreTreeNodes { } if (current.isPresent()) { final YangInstanceIdentifier currentPath = path.getAncestor(nesting); - return new SimpleImmutableEntry(currentPath, current.get()); + return new SimpleImmutableEntry<>(currentPath, current.get()); } /* @@ -98,7 +98,7 @@ public final class StoreTreeNodes { * present. At any rate we verify state just to be on the safe side. */ Verify.verify(nesting > 0); - return new SimpleImmutableEntry(path.getAncestor(nesting - 1), parent.get()); + return new SimpleImmutableEntry<>(path.getAncestor(nesting - 1), parent.get()); } public static > Optional getChild(final Optional parent, final PathArgument child) { diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java index 0f1483444f..00877d96a7 100644 --- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java +++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java @@ -178,7 +178,7 @@ public class YangInstanceIdentifierTest { YangInstanceIdentifier newID = YangInstanceIdentifier.builder() .node( NODENAME1 ) - .nodeWithKey( NODENAME2, Collections.singletonMap( KEY1, "foo" ) ) + .nodeWithKey( NODENAME2, Collections.singletonMap( KEY1, "foo" ) ) .nodeWithKey( NODENAME3, KEY2, "bar" ).build(); assertNotNull( "InstanceIdentifier is null", newID ); diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java index 260bf502e1..c5b6d80c2e 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java @@ -37,7 +37,7 @@ public class TestUtils { URI path = StreamToNormalizedNodeTest.class.getResource(resourceDirectory).toURI(); final File testDir = new File(path); final String[] fileList = testDir.list(); - final List testFiles = new ArrayList(); + final List testFiles = new ArrayList<>(); if (fileList == null) { throw new FileNotFoundException(resourceDirectory); } diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/TestUtils.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/TestUtils.java index 9d57d47d60..ed539d785a 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/TestUtils.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/TestUtils.java @@ -35,7 +35,7 @@ public class TestUtils { URI path = StreamToNormalizedNodeTest.class.getResource(resourceDirectory).toURI(); final File testDir = new File(path); final String[] fileList = testDir.list(); - final List testFiles = new ArrayList(); + final List testFiles = new ArrayList<>(); if (fileList == null) { throw new FileNotFoundException(resourceDirectory); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyStringCodec.java index dde3ec9629..46aac96180 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyStringCodec.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyStringCodec.java @@ -18,7 +18,7 @@ final class EmptyStringCodec extends TypeDefinitionAwareCodecabsent(), Void.class); + super(Optional.absent(), Void.class); } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java index 19122a00cb..bdfb928ff7 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java @@ -94,7 +94,7 @@ public final class XmlDocumentUtils { if (dataSchemaNode != null && qname != null) { for (DataSchemaNode dsn : dataSchemaNode) { if (qname.isEqualWithoutRevision(dsn.getQName())) { - return Optional. of(dsn); + return Optional.of(dsn); } else if (dsn instanceof ChoiceSchemaNode) { for (ChoiceCaseNode choiceCase : ((ChoiceSchemaNode) dsn).getCases()) { Optional foundDsn = findFirstSchema(qname, choiceCase.getChildNodes()); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtils.java index eeda8954c7..dfce4751b0 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtils.java @@ -116,7 +116,7 @@ public class XmlStreamUtils { } public void writeValue(@Nonnull final XMLStreamWriter writer, @Nonnull final SchemaNode schemaNode, final Object value) throws XMLStreamException { - writeValue(writer, schemaNode, value, Optional.absent()); + writeValue(writer, schemaNode, value, Optional.absent()); } public void writeValue(@Nonnull final XMLStreamWriter writer, @Nonnull final SchemaNode schemaNode, final Object value, final QNameModule parent) throws XMLStreamException { @@ -144,7 +144,7 @@ public class XmlStreamUtils { if (parent.isPresent()) { write(writer, (IdentityrefTypeDefinition) baseType, value, parent); } else { - write(writer, (IdentityrefTypeDefinition) baseType, value, Optional.absent()); + write(writer, (IdentityrefTypeDefinition) baseType, value, Optional.absent()); } } else if (baseType instanceof InstanceIdentifierTypeDefinition) { write(writer, (InstanceIdentifierTypeDefinition) baseType, value); @@ -171,7 +171,7 @@ public class XmlStreamUtils { } public void writeValue(@Nonnull final XMLStreamWriter writer, @Nonnull final TypeDefinition type, final Object value) throws XMLStreamException { - writeValue(writer, type, value, Optional.absent()); + writeValue(writer, type, value, Optional.absent()); } @VisibleForTesting diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlStreamUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlStreamUtils.java index ab51f8a05f..bad3552cb3 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlStreamUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlStreamUtils.java @@ -145,7 +145,7 @@ public class XmlStreamUtils { public void writeValue(@Nonnull final XMLStreamWriter writer, @Nonnull final SchemaNode schemaNode, final Object value) throws XMLStreamException { - writeValue(writer, schemaNode, value, Optional. absent()); + writeValue(writer, schemaNode, value, Optional.absent()); } public void writeValue(@Nonnull final XMLStreamWriter writer, @Nonnull final SchemaNode schemaNode, @@ -181,7 +181,7 @@ public class XmlStreamUtils { if (parent.isPresent()) { write(writer, (IdentityrefTypeDefinition) baseType, value, parent); } else { - write(writer, (IdentityrefTypeDefinition) baseType, value, Optional. absent()); + write(writer, (IdentityrefTypeDefinition) baseType, value, Optional.absent()); } } else if (baseType instanceof InstanceIdentifierTypeDefinition) { write(writer, (InstanceIdentifierTypeDefinition) baseType, value); @@ -211,7 +211,7 @@ public class XmlStreamUtils { public void writeValue(@Nonnull final XMLStreamWriter writer, @Nonnull final TypeDefinition type, final Object value) throws XMLStreamException { - writeValue(writer, type, value, Optional. absent()); + writeValue(writer, type, value, Optional.absent()); } @VisibleForTesting diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java index c5d81bac11..be38b2b0ff 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextTreeBuilder.java @@ -31,7 +31,7 @@ class LeafRefContextTreeBuilder { public LeafRefContextTreeBuilder(final SchemaContext schemaContext) { this.schemaContext = schemaContext; - this.leafRefs = new LinkedList(); + this.leafRefs = new LinkedList<>(); } public LeafRefContext buildLeafRefContextTree() throws IOException, @@ -214,7 +214,7 @@ class LeafRefContextTreeBuilder { final LeafRefPath nodeXPath = LeafRefUtils.schemaPathToLeafRefPath( node.getPath(), module); - final List foundLeafRefs = new LinkedList(); + final List foundLeafRefs = new LinkedList<>(); for (final LeafRefContext leafref : leafRefs) { final LeafRefPath leafRefTargetPath = leafref diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextUtils.java index 07158edb6a..c4705eae40 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextUtils.java @@ -167,7 +167,7 @@ public final class LeafRefContextUtils { public static List findAllLeafRefChilds( final LeafRefContext parent) { - final LinkedList leafRefChilds = new LinkedList(); + final LinkedList leafRefChilds = new LinkedList<>(); if (parent == null) { return leafRefChilds; @@ -212,7 +212,7 @@ public final class LeafRefContextUtils { public static List findAllChildsReferencedByLeafRef( final LeafRefContext parent) { - final LinkedList childsReferencedByLeafRef = new LinkedList(); + final LinkedList childsReferencedByLeafRef = new LinkedList<>(); if (parent == null) { return childsReferencedByLeafRef; @@ -250,7 +250,7 @@ public final class LeafRefContextUtils { pathFromRoot, root); if (leafRefReferencedByContext == null) { - return new HashMap(); + return new HashMap<>(); } return leafRefReferencedByContext.getAllReferencedByLeafRefCtxs(); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java index b1762982a7..5f5e0b23d7 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathParserListenerImpl.java @@ -61,7 +61,7 @@ final class LeafRefPathParserListenerImpl extends LeafRefPathParserBaseListener{ public LeafRefPathParserListenerImpl(final SchemaContext schemaContext, final Module currentModule, final SchemaNode currentNode) { this.schemaContext = schemaContext; this.module = currentModule; - this.leafRefPathQnameList = new LinkedList(); + this.leafRefPathQnameList = new LinkedList<>(); this.node=currentNode; this.currentParsingState = ParsingState.LEAF_REF_PATH; } @@ -84,7 +84,7 @@ final class LeafRefPathParserListenerImpl extends LeafRefPathParserBaseListener{ @Override public void enterRel_path_keyexpr(final Rel_path_keyexprContext ctx) { currentParsingState=ParsingState.PATH_KEY_EXPR; - predicatePathKeyQnameList = new LinkedList(); + predicatePathKeyQnameList = new LinkedList<>(); final List dots = ctx.DOTS(); for (final TerminalNode parent : dots) { predicatePathKeyQnameList.add(QNameWithPredicateBuilder.UP_PARENT_BUILDER); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/Builders.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/Builders.java index b732ace51d..e930de63c8 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/Builders.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/Builders.java @@ -111,7 +111,7 @@ public final class Builders { } public static ListNodeBuilder> orderedLeafSetBuilder(final LeafListSchemaNode schema) { - return ImmutableOrderedLeafSetNodeSchemaAwareBuilder.create(schema); + return ImmutableOrderedLeafSetNodeSchemaAwareBuilder.create(schema); } public static ListNodeBuilder> leafSetBuilder(final LeafSetNode node) { @@ -119,11 +119,11 @@ public final class Builders { } public static ListNodeBuilder> leafSetBuilder(final LeafListSchemaNode schema) { - return ImmutableLeafSetNodeSchemaAwareBuilder.create(schema); + return ImmutableLeafSetNodeSchemaAwareBuilder.create(schema); } public static ListNodeBuilder> leafSetBuilder(final LeafListSchemaNode schema, final LeafSetNode node) { - return ImmutableLeafSetNodeSchemaAwareBuilder.create(schema, node); + return ImmutableLeafSetNodeSchemaAwareBuilder.create(schema, node); } public static DataContainerNodeAttrBuilder containerBuilder() { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java index 14b200fef4..a7f9b79dd4 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNodes.java @@ -102,7 +102,7 @@ public final class ImmutableNodes { * @return serialized normalized node for provided instance Id */ public static NormalizedNode fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id) { - return fromInstanceId(ctx, id, Optional.>absent(), Optional.>absent()); + return fromInstanceId(ctx, id, Optional.absent(), Optional.absent()); } /** @@ -114,7 +114,7 @@ public final class ImmutableNodes { * @return serialized normalized node for provided instance Id with overridden last child. */ public static NormalizedNode fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id, final NormalizedNode deepestElement) { - return fromInstanceId(ctx, id, Optional.>of(deepestElement), Optional.>absent()); + return fromInstanceId(ctx, id, Optional.of(deepestElement), Optional.absent()); } /** diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java index aa777d2fec..f2530f73bb 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java @@ -284,7 +284,7 @@ abstract class InstanceIdToCompositeNodes extends Instan public UnorderedMapMixinNormalization(final ListSchemaNode list) { super(NodeIdentifier.create(list.getQName())); this.innerNode = new ListItemNormalization(new NodeIdentifierWithPredicates(list.getQName(), - Collections.emptyMap()), list); + Collections.emptyMap()), list); } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java index 04abae0905..6869b57d61 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java @@ -447,15 +447,15 @@ public final class SchemaUtils { } private static Optional tryFindGroupings(final SchemaContext ctx, final QName qname) { - return Optional. fromNullable(Iterables.find(ctx.getGroupings(), new SchemaNodePredicate(qname), null)); + return Optional.fromNullable(Iterables.find(ctx.getGroupings(), new SchemaNodePredicate(qname), null)); } private static Optional tryFindRpc(final SchemaContext ctx, final QName qname) { - return Optional.fromNullable(Iterables.find(ctx.getOperations(), new SchemaNodePredicate(qname), null)); + return Optional.fromNullable(Iterables.find(ctx.getOperations(), new SchemaNodePredicate(qname), null)); } private static Optional tryFindNotification(final SchemaContext ctx, final QName qname) { - return Optional.fromNullable(Iterables.find(ctx.getNotifications(), new SchemaNodePredicate(qname), null)); + return Optional.fromNullable(Iterables.find(ctx.getNotifications(), new SchemaNodePredicate(qname), null)); } private static final class SchemaNodePredicate implements Predicate { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java index 943c789751..72572704e3 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java @@ -62,7 +62,7 @@ public class ImmutableLeafSetNodeBuilder implements ListNodeBuilder((ImmutableLeafSetNode) node); + return new ImmutableLeafSetNodeBuilder<>((ImmutableLeafSetNode) node); } @Override @@ -108,7 +108,7 @@ public class ImmutableLeafSetNodeBuilder implements ListNodeBuilder> withChildValue(final T value) { - return withChildValue(value, Collections.emptyMap()); + return withChildValue(value, Collections.emptyMap()); } protected final static class ImmutableLeafSetNode extends diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeSchemaAwareBuilder.java index e636a4ac4f..ba0d64a1e3 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeSchemaAwareBuilder.java @@ -42,7 +42,7 @@ public final class ImmutableLeafSetNodeSchemaAwareBuilder extends ImmutableLe throw new UnsupportedOperationException(String.format("Cannot initialize from class %s", node.getClass())); } - return new ImmutableLeafSetNodeSchemaAwareBuilder(schema, (ImmutableLeafSetNode) node); + return new ImmutableLeafSetNodeSchemaAwareBuilder<>(schema, (ImmutableLeafSetNode) node); } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java index 059741d6a0..d2558319dd 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java @@ -52,7 +52,7 @@ public class ImmutableOrderedLeafSetNodeBuilder implements ListNodeBuilder((ImmutableOrderedLeafSetNode) node); + return new ImmutableOrderedLeafSetNodeBuilder<>((ImmutableOrderedLeafSetNode) node); } private void checkDirty() { @@ -108,7 +108,7 @@ public class ImmutableOrderedLeafSetNodeBuilder implements ListNodeBuilder> withChildValue(final T value) { - return withChildValue(value, Collections.emptyMap()); + return withChildValue(value, Collections.emptyMap()); } protected static final class ImmutableOrderedLeafSetNode extends diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeSchemaAwareBuilder.java index 5d467180aa..a3ad5501f5 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeSchemaAwareBuilder.java @@ -42,7 +42,7 @@ public final class ImmutableOrderedLeafSetNodeSchemaAwareBuilder extends Immu throw new UnsupportedOperationException(String.format("Cannot initialize from class %s", node.getClass())); } - return new ImmutableOrderedLeafSetNodeSchemaAwareBuilder(schema, (ImmutableOrderedLeafSetNode) node); + return new ImmutableOrderedLeafSetNodeSchemaAwareBuilder<>(schema, (ImmutableOrderedLeafSetNode) node); } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java index 8151b2a02a..f2677571f0 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java @@ -30,7 +30,7 @@ public abstract class AbstractImmutableDataContainerNode @Override public final Optional> getChild(final PathArgument child) { - return Optional.> fromNullable(children.get(child)); + return Optional.fromNullable(children.get(child)); } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/ListNodeBaseParser.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/ListNodeBaseParser.java index b5bd5c8f7e..b72eb3a7e7 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/ListNodeBaseParser.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/ListNodeBaseParser.java @@ -40,7 +40,7 @@ public abstract class ListNodeBaseParser, O ex public O parse(Iterable childNodes, S schema) { CollectionNodeBuilder listBuilder = provideBuilder(schema); - buildingStrategy.prepareAttributes(Collections.emptyMap(), listBuilder); + buildingStrategy.prepareAttributes(Collections.emptyMap(), listBuilder); for (E childNode : childNodes) { N listChild = getListEntryNodeParser().parse(Collections.singletonList(childNode), schema); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java index d9ff8928cd..90ecd84b77 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2015, 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -116,7 +116,7 @@ abstract class AbstractDataTreeCandidateNode implements DataTreeCandidateNode { } protected final Optional> dataOptional() { - return Optional.>of(data); + return Optional.of(data); } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeTip.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeTip.java index 973c6fa0b0..036e0af765 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeTip.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeTip.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailed import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; abstract class AbstractDataTreeTip implements DataTreeTip { - private static final YangInstanceIdentifier PUBLIC_ROOT_PATH = YangInstanceIdentifier.create(Collections.emptyList()); + private static final YangInstanceIdentifier PUBLIC_ROOT_PATH = YangInstanceIdentifier.create(Collections.emptyList()); /** * Return the current root node of this tip. diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java index 5e9a6766c7..b77cb17af7 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java @@ -24,7 +24,7 @@ abstract class AbstractLeafCandidateNode implements DataTreeCandidateNode { } protected final Optional> dataOptional() { - return Optional.>of(data); + return Optional.of(data); } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java index 439c43193a..92586972e9 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2015, 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -125,7 +125,7 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida private static Optional> optionalData(final TreeNode meta) { if (meta != null) { - return Optional.>of(meta.getData()); + return Optional.of(meta.getData()); } else { return Optional.absent(); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java index 0a137ab3b1..cd361ce328 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java @@ -131,7 +131,7 @@ final class InMemoryDataTreeModification extends AbstractCursorAware implements LOG.trace("Resolving modification apply strategy for {}", path); upgradeIfPossible(); - return StoreTreeNodes.findNodeChecked(strategyTree, path); + return StoreTreeNodes.findNodeChecked(strategyTree, path); } private OperationWithModification resolveModificationFor(final YangInstanceIdentifier path) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java index 26261bdfba..7360e988d2 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java @@ -119,7 +119,7 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode metadataFromSnapshot(@Nonnull final PathArgument child) { - return original.isPresent() ? original.get().getChild(child) : Optional.absent(); + return original.isPresent() ? original.get().getChild(child) : Optional.absent(); } private Optional metadataFromData(@Nonnull final PathArgument child, final Version modVersion) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OrderedLeafSetModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OrderedLeafSetModificationStrategy.java index 488cc2281f..f1e545b0cf 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OrderedLeafSetModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OrderedLeafSetModificationStrategy.java @@ -25,7 +25,7 @@ final class OrderedLeafSetModificationStrategy extends AbstractNodeContainerModi @SuppressWarnings({ "unchecked", "rawtypes" }) OrderedLeafSetModificationStrategy(final LeafListSchemaNode schema, final TreeType treeType) { super((Class) LeafSetNode.class, treeType); - entryStrategy = Optional. of(new LeafSetEntryModificationStrategy(schema)); + entryStrategy = Optional.of(new LeafSetEntryModificationStrategy(schema)); } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OrderedMapModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OrderedMapModificationStrategy.java index c69a170f24..4143fb83ec 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OrderedMapModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OrderedMapModificationStrategy.java @@ -24,7 +24,7 @@ final class OrderedMapModificationStrategy extends AbstractNodeContainerModifica OrderedMapModificationStrategy(final ListSchemaNode schema, final TreeType treeType) { super(OrderedMapNode.class, treeType); - entryStrategy = Optional. of(new ListEntryModificationStrategy(schema, treeType)); + entryStrategy = Optional.of(new ListEntryModificationStrategy(schema, treeType)); } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/RecursiveReplaceCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/RecursiveReplaceCandidateNode.java index 6538c0a1ce..224aa32dce 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/RecursiveReplaceCandidateNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/RecursiveReplaceCandidateNode.java @@ -40,7 +40,7 @@ final class RecursiveReplaceCandidateNode extends AbstractDataTreeCandidateNode @Override public Optional> getDataBefore() { - return Optional.>of(oldData); + return Optional.of(oldData); } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ReplaceLeafCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ReplaceLeafCandidateNode.java index 9b48744b7f..b264a20e1e 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ReplaceLeafCandidateNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ReplaceLeafCandidateNode.java @@ -21,6 +21,6 @@ final class ReplaceLeafCandidateNode extends AbstractWriteCandidate { @Override public Optional> getDataBefore() { - return Optional.>of(oldData); + return Optional.of(oldData); } } \ No newline at end of file diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java index ea40848084..2ca70603d4 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java @@ -192,7 +192,7 @@ abstract class SchemaAwareApplyOperation extends ModificationApplyOperation { case DELETE: // Deletion of a non-existing node is a no-op, report it as such modification.resolveModificationType(currentMeta.isPresent() ? ModificationType.DELETE : ModificationType.UNMODIFIED); - return modification.setSnapshot(Optional. absent()); + return modification.setSnapshot(Optional.absent()); case TOUCH: Preconditions.checkArgument(currentMeta.isPresent(), "Metadata not available for modification %s", modification); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java index 561f5fcc78..fd538cb0f1 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java @@ -28,7 +28,7 @@ final class UnkeyedListModificationStrategy extends SchemaAwareApplyOperation { private final Optional entryStrategy; UnkeyedListModificationStrategy(final ListSchemaNode schema, final TreeType treeType) { - entryStrategy = Optional. of(new UnkeyedListItemModificationStrategy(schema, treeType)); + entryStrategy = Optional.of(new UnkeyedListItemModificationStrategy(schema, treeType)); } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedLeafSetModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedLeafSetModificationStrategy.java index e52325ea79..709a4a9a0d 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedLeafSetModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedLeafSetModificationStrategy.java @@ -24,7 +24,7 @@ final class UnorderedLeafSetModificationStrategy extends AbstractNodeContainerMo @SuppressWarnings({ "unchecked", "rawtypes" }) UnorderedLeafSetModificationStrategy(final LeafListSchemaNode schema, final TreeType treeType) { super((Class) LeafSetNode.class, treeType); - entryStrategy = Optional. of(new LeafSetEntryModificationStrategy(schema)); + entryStrategy = Optional.of(new LeafSetEntryModificationStrategy(schema)); } @SuppressWarnings("rawtypes") diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedMapModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedMapModificationStrategy.java index 601939bc97..1e66f4a24c 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedMapModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnorderedMapModificationStrategy.java @@ -24,7 +24,7 @@ final class UnorderedMapModificationStrategy extends AbstractNodeContainerModifi UnorderedMapModificationStrategy(final ListSchemaNode schema, final TreeType treeType) { super(MapNode.class, treeType); - entryStrategy = Optional.of(new ListEntryModificationStrategy(schema, treeType)); + entryStrategy = Optional.of(new ListEntryModificationStrategy(schema, treeType)); } @SuppressWarnings("rawtypes") diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtilsTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtilsTest.java index 3b43623604..50dab8e3a2 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtilsTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtilsTest.java @@ -75,7 +75,7 @@ public class XmlStreamUtilsTest { QName name = getAttrQName("namespace", "2012-12-12", "attr", Optional.of("prefix")); final Map.Entry attributeEntry = new AbstractMap.SimpleEntry<>(name, "value"); - name = getAttrQName("namespace2", "2012-12-12", "attr", Optional.absent()); + name = getAttrQName("namespace2", "2012-12-12", "attr", Optional.absent()); final Map.Entry attributeEntryNoPrefix = new AbstractMap.SimpleEntry<>(name, "value"); final RandomPrefix randomPrefix = new RandomPrefix(); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlStreamUtilsTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlStreamUtilsTest.java index 77a2a80ba0..457ea4315d 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlStreamUtilsTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/retest/XmlStreamUtilsTest.java @@ -74,7 +74,7 @@ public class XmlStreamUtilsTest { QName name = getAttrQName("namespace", "2012-12-12", "attr", Optional.of("prefix")); final Map.Entry attributeEntry = new AbstractMap.SimpleEntry<>(name, "value"); - name = getAttrQName("namespace2", "2012-12-12", "attr", Optional. absent()); + name = getAttrQName("namespace2", "2012-12-12", "attr", Optional.absent()); final Map.Entry attributeEntryNoPrefix = new AbstractMap.SimpleEntry<>(name, "value"); final RandomPrefix randomPrefix = new RandomPrefix(); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java index 2e13a4fe0e..e508096511 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java @@ -259,7 +259,7 @@ public class DataTreeCandidateValidatorTest { private static void writeIntoMapEntry() { - final Map keys = new HashMap(); + final Map keys = new HashMap<>(); keys.put(name, "New Project"); final NodeIdentifierWithPredicates mapEntryPath = new NodeIdentifierWithPredicates( project, keys); @@ -305,7 +305,7 @@ public class DataTreeCandidateValidatorTest { private static void writeMapEntry() { - final Map keys = new HashMap(); + final Map keys = new HashMap<>(); keys.put(name, "New Project"); final NodeIdentifierWithPredicates mapEntryPath = new NodeIdentifierWithPredicates( project, keys); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java index 211a50b0a6..c8368cafdf 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java @@ -259,7 +259,7 @@ public class DataTreeCandidateValidatorTest { private static void writeIntoMapEntry() { - final Map keys = new HashMap(); + final Map keys = new HashMap<>(); keys.put(name, "New Project"); final NodeIdentifierWithPredicates mapEntryPath = new NodeIdentifierWithPredicates( project, keys); @@ -306,7 +306,7 @@ public class DataTreeCandidateValidatorTest { private static void writeMapEntry() { - final Map keys = new HashMap(); + final Map keys = new HashMap<>(); keys.put(name, "New Project"); final NodeIdentifierWithPredicates mapEntryPath = new NodeIdentifierWithPredicates( project, keys); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/BuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/BuilderTest.java index b81b15428f..76e7189d05 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/BuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/BuilderTest.java @@ -106,7 +106,7 @@ public class BuilderTest { public void immutableOrderedMapBuilderTest() { final LinkedList mapEntryNodeColl = new LinkedList(); mapEntryNodeColl.add(LIST_MAIN_CHILD_3); - final Map keys = new HashMap(); + final Map keys = new HashMap<>(); keys.put(LIST_MAIN_CHILD_QNAME_1, 1); final YangInstanceIdentifier.NodeIdentifierWithPredicates mapEntryPath = new YangInstanceIdentifier .NodeIdentifierWithPredicates(LIST_MAIN, keys); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/test/codecs/BitsCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/test/codecs/BitsCodecStringTest.java index 300076ecec..fe1b029aeb 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/test/codecs/BitsCodecStringTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/test/codecs/BitsCodecStringTest.java @@ -41,7 +41,7 @@ public class BitsCodecStringTest { assertTrue(serialized.contains("bar")); assertEquals("serialize", "", - codec.serialize(ImmutableSet. of())); + codec.serialize(ImmutableSet.of())); assertEquals("serialize", "", codec.serialize(null)); } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/test/codecs/TypeDefinitionAwareCodecTestHelper.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/test/codecs/TypeDefinitionAwareCodecTestHelper.java index df0dd758af..15d90515e8 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/test/codecs/TypeDefinitionAwareCodecTestHelper.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/test/codecs/TypeDefinitionAwareCodecTestHelper.java @@ -58,7 +58,7 @@ public class TypeDefinitionAwareCodecTestHelper { } return EnumerationType.create( mock( SchemaPath.class ), enumList, - Optional.absent() ); + Optional.absent() ); } public static UnionTypeDefinition toUnionTypeDefinition( TypeDefinition... types ) { diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedMapMixinContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedMapMixinContextNode.java index 9446ff6b7b..5adaae6750 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedMapMixinContextNode.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedMapMixinContextNode.java @@ -21,7 +21,7 @@ class UnorderedMapMixinContextNode extends AbstractMixinContextNode emptyMap()), list); + Collections.emptyMap()), list); } @Override diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaResolutionException.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaResolutionException.java index 528ea7e173..b864611bb3 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaResolutionException.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaResolutionException.java @@ -35,7 +35,7 @@ public class SchemaResolutionException extends SchemaSourceException { } public SchemaResolutionException(@Nonnull final String message, final Throwable cause) { - this(message, cause, Collections.emptySet(), ImmutableMultimap.of()); + this(message, cause, Collections.emptySet(), ImmutableMultimap.of()); } public SchemaResolutionException(@Nonnull final String message, final Collection resolvedSources, diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceFilter.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceFilter.java index f3122ebec0..2deaab6dc4 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceFilter.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceFilter.java @@ -25,7 +25,7 @@ public interface SchemaSourceFilter { */ SchemaSourceFilter ALWAYS_ACCEPT = new SchemaSourceFilter() { private final Iterable> representations = - Collections.>singletonList(SchemaSourceRepresentation.class); + Collections.singletonList(SchemaSourceRepresentation.class); private final ListenableFuture applyFuture = Futures.immediateFuture(Boolean.TRUE); @Override diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextSchemaSource.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextSchemaSource.java index d1f8807a30..1c3783f98e 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextSchemaSource.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YangTextSchemaSource.java @@ -33,7 +33,7 @@ public abstract class YangTextSchemaSource extends ByteSource implements YangSch public static SourceIdentifier identifierFromFilename(final String name) { checkArgument(name.endsWith(".yang"), "Filename %s does not have a .yang extension", name); // FIXME: add revision-awareness - return SourceIdentifier.create(name.substring(0, name.length() - 5), Optional.absent()); + return SourceIdentifier.create(name.substring(0, name.length() - 5), Optional.absent()); } /** diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YinTextSchemaSource.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YinTextSchemaSource.java index 3fea163af8..2afe45f81e 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YinTextSchemaSource.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/YinTextSchemaSource.java @@ -32,7 +32,7 @@ public abstract class YinTextSchemaSource extends ByteSource implements YinSchem public static SourceIdentifier identifierFromFilename(final String name) { checkArgument(name.endsWith(".yin"), "Filename %s does not have a .yin extension", name); // FIXME: add revision-awareness - return SourceIdentifier.create(name.substring(0, name.length() - 4), Optional.absent()); + return SourceIdentifier.create(name.substring(0, name.length() - 4), Optional.absent()); } /** diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SimpleModuleTest.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SimpleModuleTest.java index 1ce27d2ea8..546741aa9c 100644 --- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SimpleModuleTest.java +++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SimpleModuleTest.java @@ -44,7 +44,7 @@ public class SimpleModuleTest { @Before public void init() { schemaRegistry = new SharedSchemaRepository("test"); - fileSourceProvider = new FilesystemSchemaSourceCache(schemaRegistry, + fileSourceProvider = new FilesystemSchemaSourceCache<>(schemaRegistry, YangTextSchemaSource.class, TEST_MODELS_FOLDER); final TextToASTTransformer astTransformer = TextToASTTransformer.create(schemaRegistry, schemaRegistry); schemaRegistry.registerSchemaSourceListener(astTransformer); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java index bb6d1d4eb8..ce8bdc784e 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java @@ -89,7 +89,7 @@ public abstract class AbstractSchemaRepository implements SchemaRepository, Sche public CheckedFuture getSchemaSource(final SourceIdentifier id, final Class representation) { final ListMultimap, AbstractSchemaSourceRegistration> srcs = sources.get(id); if (srcs == null) { - return Futures.immediateFailedCheckedFuture(new MissingSchemaSourceException("No providers registered for source" + id, id)); + return Futures.immediateFailedCheckedFuture(new MissingSchemaSourceException("No providers registered for source" + id, id)); } // TODO, remove and make sources keep sorted multimap (e.g. ArrayListMultimap with SortedLists) @@ -98,7 +98,7 @@ public abstract class AbstractSchemaRepository implements SchemaRepository, Sche final Iterator> regs = sortedSchemaSourceRegistrations.iterator(); if (!regs.hasNext()) { - return Futures.immediateFailedCheckedFuture( + return Futures.immediateFailedCheckedFuture( new MissingSchemaSourceException("No providers for source " + id + " representation " + representation + " available", id)); } @@ -130,7 +130,7 @@ public abstract class AbstractSchemaRepository implements SchemaRepository, Sche m.put(source.getRepresentation(), reg); - final Collection> reps = Collections.>singleton(source); + final Collection> reps = Collections.singleton(source); for (SchemaListenerRegistration l : listeners) { l.getInstance().schemaSourceRegistered(reps); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java index 427a91ba2f..0234cc7759 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java @@ -54,7 +54,7 @@ public final class FilesystemSchemaSourceCache, StorageAdapter> STORAGE_ADAPTERS = - Collections., StorageAdapter> singletonMap( + Collections.singletonMap( YangTextSchemaSource.class, new YangTextSchemaStorageAdapter()); private static final Pattern CACHED_FILE_PATTERN = @@ -123,7 +123,7 @@ public final class FilesystemSchemaSourceCacheimmediateFailedCheckedFuture(new MissingSchemaSourceException("Source not found", sourceIdentifier)); + return Futures.immediateFailedCheckedFuture(new MissingSchemaSourceException("Source not found", sourceIdentifier)); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCache.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCache.java index 52a5a957eb..141cdb52bb 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCache.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCache.java @@ -28,7 +28,7 @@ import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistry; @Beta public class InMemorySchemaSourceCache extends AbstractSchemaSourceCache implements AutoCloseable { - private final List> regs = Collections.synchronizedList(new ArrayList>()); + private final List> regs = Collections.synchronizedList(new ArrayList<>()); private final FinalizableReferenceQueue queue = new FinalizableReferenceQueue(); private final Cache cache; @@ -54,7 +54,7 @@ public class InMemorySchemaSourceCache ext return Futures.immediateCheckedFuture(present); } - return Futures.immediateFailedCheckedFuture(new MissingSchemaSourceException("Source not found", sourceIdentifier)); + return Futures.immediateFailedCheckedFuture(new MissingSchemaSourceException("Source not found", sourceIdentifier)); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSchemaContext.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSchemaContext.java index fa69b53545..28c4ab417f 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSchemaContext.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractSchemaContext.java @@ -125,7 +125,7 @@ public abstract class AbstractSchemaContext implements SchemaContext { @Override public Set findModuleByNamespace(final URI namespace) { final Set ret = getNamespaceToModules().get(namespace); - return ret == null ? Collections.emptySet() : ret; + return ret == null ? Collections.emptySet() : ret; } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java index cfe3d8625f..a6087d06aa 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java @@ -134,7 +134,7 @@ public final class BaseTypes { */ @Deprecated public static Optional> defaultBaseTypeFor(final String typeName) { - return Optional.> fromNullable(defaultBaseTypeForImpl(typeName)); + return Optional.fromNullable(defaultBaseTypeForImpl(typeName)); } @Deprecated 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 b507099d64..728f52d458 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 @@ -64,8 +64,8 @@ public final class FilteringSchemaContextProxy extends AbstractSchemaContext { final Builder filteredModulesBuilder = new Builder<>(); - final SetMultimap nsMap = Multimaps.newSetMultimap(new TreeMap>(), MODULE_SET_SUPPLIER); - final SetMultimap nameMap = Multimaps.newSetMultimap(new TreeMap>(), MODULE_SET_SUPPLIER); + final SetMultimap nsMap = Multimaps.newSetMultimap(new TreeMap<>(), MODULE_SET_SUPPLIER); + final SetMultimap nameMap = Multimaps.newSetMultimap(new TreeMap<>(), MODULE_SET_SUPPLIER); ImmutableMap.Builder identifiersToSourcesBuilder = ImmutableMap.builder(); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java index 2b7d5dc83b..b10633a2ea 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java @@ -470,7 +470,7 @@ public final class SchemaContextUtil { Preconditions.checkArgument(parentModule != null, "Parent Module reference cannot be NULL"); Preconditions.checkArgument(xpath != null, "XPath string reference cannot be NULL"); - final List path = new LinkedList(); + final List path = new LinkedList<>(); for (final String pathComponent : SLASH_SPLITTER.split(xpath)) { if (!pathComponent.isEmpty()) { path.add(stringPathPartToQName(context, parentModule, pathComponent)); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java index a9d171ca2c..237fa5e6b0 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractBaseType.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; abstract class AbstractBaseType> extends AbstractTypeDefinition { AbstractBaseType(final QName qname) { - this(SchemaPath.create(true, qname), ImmutableList.of()); + this(SchemaPath.create(true, qname), ImmutableList.of()); } AbstractBaseType(final SchemaPath path, final List unknownSchemaNodes) { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangedBaseType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangedBaseType.java index 30bff700cd..4ab19cbb2a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangedBaseType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRangedBaseType.java @@ -22,8 +22,8 @@ abstract class AbstractRangedBaseType> extends Abstr AbstractRangedBaseType(final QName qname, final Number minValue, final Number maxValue) { super(qname); - this.rangeConstraints = ImmutableList.of(BaseConstraints.newRangeConstraint( - minValue, maxValue, Optional.absent(), Optional.absent())); + this.rangeConstraints = ImmutableList.of(BaseConstraints.newRangeConstraint( + minValue, maxValue, Optional.absent(), Optional.absent())); } AbstractRangedBaseType(final SchemaPath path, final List unknownSchemaNodes, diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java index 7520da9259..cdbc403f95 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/BaseDecimalType.java @@ -45,7 +45,7 @@ final class BaseDecimalType extends AbstractRangedBaseType createRangeConstraint(final String min, final String max) { return ImmutableList.of(BaseConstraints.newRangeConstraint(new BigDecimal(min), new BigDecimal(max), - Optional.absent(), Optional.of("https://tools.ietf.org/html/rfc6020#section-9.3.4"))); + Optional.absent(), Optional.of("https://tools.ietf.org/html/rfc6020#section-9.3.4"))); } static List constraintsForDigits(final int fractionDigits) { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/JavaLengthConstraints.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/JavaLengthConstraints.java index 26c88398ed..dcf11c5baf 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/JavaLengthConstraints.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/JavaLengthConstraints.java @@ -19,5 +19,5 @@ final class JavaLengthConstraints { } static final List INTEGER_SIZE_CONSTRAINTS = ImmutableList.of( - BaseConstraints.newLengthConstraint(0, Integer.MAX_VALUE, Optional.absent(), Optional.absent())); + BaseConstraints.newLengthConstraint(0, Integer.MAX_VALUE, Optional.absent(), Optional.absent())); } diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java index 05c4127e5e..20a43df62d 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java @@ -49,8 +49,9 @@ public class SchemaSourceTransformerTest { @Test public void schemaSourceTransformerTest() { - this.schema = new SchemaSourceTransformer( - this.provider, SchemaSourceTransformerTest.SRC_CLASS, this.consumer, SchemaSourceTransformerTest.DST_CLASS, this.function); + this.schema = new SchemaSourceTransformer<>( + this.provider, SchemaSourceTransformerTest.SRC_CLASS, this.consumer, + SchemaSourceTransformerTest.DST_CLASS, this.function); Assert.assertNotNull(this.schema); } @@ -60,7 +61,7 @@ public class SchemaSourceTransformerTest { final Registrator reg = new Registrator(p, SchemaSourceTransformerTest.SRC_CLASS, PotentialSchemaSource.Costs.IMMEDIATE); final SourceIdentifier sourceIdentifier = new SourceIdentifier("source"); reg.register(sourceIdentifier); - this.schema = new SchemaSourceTransformer(p, + this.schema = new SchemaSourceTransformer<>(p, SchemaSourceTransformerTest.SRC_CLASS, this.consumer, SchemaSourceTransformerTest.DST_CLASS, this.function); final SchemaSourceProvider provider = this.schema; @@ -83,7 +84,7 @@ public class SchemaSourceTransformerTest { reg.register(sourceIdentifier); final Consumer c = new Consumer(); - this.schema = new SchemaSourceTransformer(p, + this.schema = new SchemaSourceTransformer<>(p, SchemaSourceTransformerTest.SRC_CLASS, c, SchemaSourceTransformerTest.DST_CLASS, this.function); final SchemaSourceListener listener = this.schema; diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImplTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImplTest.java index 839f1e72ba..20c7b37d49 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImplTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImplTest.java @@ -48,7 +48,7 @@ public class MustDefinitionImplTest { assertFalse("mdiA shouldn't equal to mdiB", mdiA.equals(mdiB)); // //description - mdiA = MustDefinitionImpl.create("mustStr", Optional.absent(), reference, errorAppTag, errorMessage); + mdiA = MustDefinitionImpl.create("mustStr", Optional.absent(), reference, errorAppTag, errorMessage); mdiB = MustDefinitionImpl.create("mustStr", description, reference, errorAppTag, errorMessage); assertFalse("mdiA shouldn't equal to mdiB", mdiA.equals(mdiB)); @@ -57,7 +57,7 @@ public class MustDefinitionImplTest { assertFalse("mdiA shouldn't equal to mdiB", mdiA.equals(mdiB)); // //reference - mdiA = MustDefinitionImpl.create("mustStr", description, Optional.absent(), errorAppTag, errorMessage); + mdiA = MustDefinitionImpl.create("mustStr", description, Optional.absent(), errorAppTag, errorMessage); mdiB = MustDefinitionImpl.create("mustStr", description, reference, errorAppTag, errorMessage); assertFalse("mdiA shouldn't equal to mdiB", mdiA.equals(mdiB)); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java index 792db8d9c8..b8f9e7e1df 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java @@ -625,7 +625,7 @@ public final class BuilderUtils { Set notifications = module.getAddedNotifications(); for (NotificationBuilder notification : notifications) { if (notification.getQName().equals(child)) { - return Optional. of(notification); + return Optional.of(notification); } } @@ -635,7 +635,7 @@ public final class BuilderUtils { Set rpcs = module.getAddedRpcs(); for (RpcDefinitionBuilder rpc : rpcs) { if (rpc.getQName().equals(child)) { - return Optional. of(rpc); + return Optional.of(rpc); } } LOG.trace("Child {} not found in data namespace of module {}", child, module); @@ -645,7 +645,7 @@ public final class BuilderUtils { private static Optional getDataChildByQName(final DataNodeContainerBuilder builder, final QName child) { for (DataSchemaNodeBuilder childNode : builder.getChildNodeBuilders()) { if (childNode.getQName().equals(child)) { - return Optional. of(childNode); + return Optional.of(childNode); } } LOG.trace(CHILD_NOT_FOUND_IN_NODE_STR, child, builder); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java index 03c1341184..9b6fb50059 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ChoiceBuilder.java @@ -74,7 +74,7 @@ public final class ChoiceBuilder extends AbstractSchemaNodeBuilder implements Da configuration = base.isConfiguration(); augmentations.addAll(base.getAvailableAugmentations()); - Set wrapped = BuilderUtils.wrapChildNodes(moduleName, line, new HashSet( + Set wrapped = BuilderUtils.wrapChildNodes(moduleName, line, new HashSet<>( base.getCases()), path, qname); for (DataSchemaNodeBuilder wrap : wrapped) { if (wrap instanceof ChoiceCaseBuilder) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java index 79e992028d..e7808dc37d 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java @@ -72,7 +72,7 @@ public class ModuleBuilder extends AbstractDocumentedDataNodeContainerBuilder im private ModuleImpl instance; private final String name; private final String sourcePath; - private static final SchemaPath SCHEMA_PATH = SchemaPath.create(Collections. emptyList(), true); + private static final SchemaPath SCHEMA_PATH = SchemaPath.create(Collections.emptyList(), true); private String prefix; private QNameModule qnameModule = EMPTY_QNAME_MODULE; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java index a17dc56f1f..e6abb121b3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java @@ -74,8 +74,8 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem super(builder); this.name = checkNotNull(name, "Missing name"); this.sourcePath = sourcePath; //TODO: can this be nullable? - this.imports = ImmutableSet. copyOf(builder.imports.values()); - this.submodules = ImmutableSet. copyOf(builder.submodules); + this.imports = ImmutableSet.copyOf(builder.imports.values()); + this.submodules = ImmutableSet.copyOf(builder.submodules); this.prefix = builder.getPrefix(); this.qnameModule = QNameModule.create(builder.getNamespace(), diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java index 44b83477f6..2cdf33ae26 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/ParserListenerUtils.java @@ -531,7 +531,7 @@ public final class ParserListenerUtils { */ public static Set createListKey(final Key_stmtContext ctx) { final String keyDefinition = stringFromNode(ctx); - return Sets.newLinkedHashSet(KEYDEF_SPLITTER.split(keyDefinition)); + return Sets.newLinkedHashSet(KEYDEF_SPLITTER.split(keyDefinition)); } /** @@ -1466,7 +1466,7 @@ public final class ParserListenerUtils { baseType = uintType; } else if ("enumeration".equals(typeName)) { List enumConstants = getEnumConstants(typeBody, actualPath, moduleName); - return EnumerationType.create(baseTypePath, enumConstants, Optional. absent()); + return EnumerationType.create(baseTypePath, enumConstants, Optional.absent()); } else if ("string".equals(typeName)) { StringTypeDefinition stringType = StringType.getInstance(); constraints.addLengths(stringType.getLengthConstraints()); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java index 652011a225..c5e87a1053 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/SchemaContextImpl.java @@ -49,9 +49,9 @@ final class SchemaContextImpl extends AbstractSchemaContext { * Invest some quality time in building up lookup tables for both. */ final SetMultimap nsMap = Multimaps.newSetMultimap( - new TreeMap>(), MODULE_SET_SUPPLIER); + new TreeMap<>(), MODULE_SET_SUPPLIER); final SetMultimap nameMap = Multimaps.newSetMultimap( - new TreeMap>(), MODULE_SET_SUPPLIER); + new TreeMap<>(), MODULE_SET_SUPPLIER); for (Module m : modules) { nameMap.put(m.getName(), m); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java index b25986d34d..c8e88c4dfa 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserImpl.java @@ -181,7 +181,7 @@ public final class YangParserImpl implements YangContextParser { public SchemaContext parseFiles(final Collection yangFiles, final SchemaContext context) throws IOException, YangSyntaxErrorException { if (yangFiles == null) { - return resolveSchemaContext(Collections. emptySet()); + return resolveSchemaContext(Collections.emptySet()); } Collection sources = BuilderUtils.filesToByteSources(yangFiles); @@ -219,7 +219,7 @@ public final class YangParserImpl implements YangContextParser { public SchemaContext parseSources(final Collection sources, final SchemaContext context) throws IOException, YangSyntaxErrorException { if (sources == null) { - return resolveSchemaContext(Collections. emptySet()); + return resolveSchemaContext(Collections.emptySet()); } final List sorted = resolveModuleBuilders(sources, context); @@ -961,7 +961,7 @@ public final class YangParserImpl implements YangContextParser { // Conflicting elements in other namespaces are still not present // since resolveUsesAugment occurs before augmenting from external // modules. - potentialTargetNode = Optional. fromNullable(findTargetNode(augment.getTargetPath() + potentialTargetNode = Optional.fromNullable(findTargetNode(augment.getTargetPath() .getPathFromRoot(), parentNode)); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java index a96ac87991..affa642e43 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/DependencyResolver.java @@ -142,7 +142,7 @@ final class DependencyResolver { return new DependencyResolver(resolved, pending, imports); } else { - return new DependencyResolver(resolved, Collections.emptyList(), ImmutableMultimap.of()); + return new DependencyResolver(resolved, Collections.emptyList(), ImmutableMultimap.of()); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java index 9b5fb1ee91..3a79452e7a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java @@ -54,7 +54,7 @@ public final class YangTextSchemaContextResolver implements AutoCloseable, Schem private final Collection requiredSources = new ConcurrentLinkedDeque<>(); private final Multimap texts = ArrayListMultimap.create(); private final AtomicReference> currentSchemaContext = - new AtomicReference<>(Optional.absent()); + new AtomicReference<>(Optional.absent()); private final InMemorySchemaSourceCache cache; private final SchemaListenerRegistration transReg; private final SchemaSourceRegistry registry; @@ -159,7 +159,7 @@ public final class YangTextSchemaContextResolver implements AutoCloseable, Schem public YangTextSchemaSourceRegistration registerSource(@Nonnull final URL url) throws SchemaSourceException, IOException, YangSyntaxErrorException { checkArgument(url != null, "Supplied URL must not be null"); - final SourceIdentifier guessedId = new SourceIdentifier(url.getFile(), Optional.absent()); + final SourceIdentifier guessedId = new SourceIdentifier(url.getFile(), Optional.absent()); return registerSource(new YangTextSchemaSource(guessedId) { @Override public InputStream openStream() throws IOException { @@ -230,7 +230,7 @@ public final class YangTextSchemaContextResolver implements AutoCloseable, Schem LOG.debug("Lookup {} result {}", sourceIdentifier, ret); if (ret.isEmpty()) { - return Futures.immediateFailedCheckedFuture( + return Futures.immediateFailedCheckedFuture( new MissingSchemaSourceException("URL for " + sourceIdentifier + " not registered", sourceIdentifier)); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupportBundle.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupportBundle.java index f137faf667..08e723ecce 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupportBundle.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementSupportBundle.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace; public final class StatementSupportBundle implements Immutable,NamespaceBehaviour.Registry { - private static final StatementSupportBundle EMPTY = new StatementSupportBundle(null, ImmutableMap.>of(), ImmutableMap., NamespaceBehaviour>of()); + private static final StatementSupportBundle EMPTY = new StatementSupportBundle(null, ImmutableMap.of(), ImmutableMap.of()); private final StatementSupportBundle parent; private final ImmutableMap> definitions; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java index 31ab8b381b..2966245673 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2015, 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -102,7 +102,7 @@ class ModifierImpl implements ModelActionBuilder { private , N extends StatementNamespace> AbstractPrerequisite requiresCtxImpl(final StmtContext context, final Class namespace, final K key,final ModelProcessingPhase phase) { checkNotRegistered(); try { - AddedToNamespace addedToNs = new AddedToNamespace(phase); + AddedToNamespace addedToNs = new AddedToNamespace<>(phase); addReq(addedToNs); contextImpl(context).onNamespaceItemAddedAction((Class) namespace,key,addedToNs); return addedToNs; @@ -114,7 +114,7 @@ class ModifierImpl implements ModelActionBuilder { private > AbstractPrerequisite requiresCtxImpl(final C context, final ModelProcessingPhase phase) { Preconditions.checkState(action == null, "Action was already registered."); try { - PhaseFinished phaseFin = new PhaseFinished(); + PhaseFinished phaseFin = new PhaseFinished<>(); addReq(phaseFin); contextImpl(context).addPhaseCompletedListener(phase,phaseFin); return phaseFin; @@ -127,7 +127,7 @@ class ModifierImpl implements ModelActionBuilder { private , N extends IdentifierNamespace>> AbstractPrerequisite mutatesCtxImpl( final StmtContext context, final Class namespace, final K key, final ModelProcessingPhase phase) { try { - PhaseModificationInNamespace mod = new PhaseModificationInNamespace(phase); + PhaseModificationInNamespace mod = new PhaseModificationInNamespace<>(phase); addReq(mod); addMutation(mod); contextImpl(context).onNamespaceItemAddedAction((Class) namespace,key,mod); @@ -155,7 +155,7 @@ class ModifierImpl implements ModelActionBuilder { @Override public , CT extends C> Prerequisite mutatesCtx(final CT context, final ModelProcessingPhase phase) { try { - return addMutation(new PhaseMutation(contextImpl(context),phase)); + return addMutation(new PhaseMutation<>(contextImpl(context), phase)); } catch (InferenceException e) { throw shouldNotHappenProbablyBug(e); } @@ -174,7 +174,7 @@ class ModifierImpl implements ModelActionBuilder { @Override public > Prerequisite requiresDeclared(final StmtContext context) { - return requiresCtxImpl(context, FULL_DECLARATION).transform(StmtContextUtils.buildDeclared()); + return requiresCtxImpl(context, FULL_DECLARATION).transform(StmtContextUtils.buildDeclared()); } @Override @@ -187,12 +187,12 @@ class ModifierImpl implements ModelActionBuilder { public , N extends StatementNamespace> Prerequisite requiresDeclared( final StmtContext context, final Class namespace, final K key) { final AbstractPrerequisite> rawContext = requiresCtxImpl(context, namespace, key, FULL_DECLARATION); - return rawContext.transform(StmtContextUtils.buildDeclared()); + return rawContext.transform(StmtContextUtils.buildDeclared()); } @Override public > Prerequisite requiresEffective(final StmtContext stmt) { - return requiresCtxImpl(stmt, EFFECTIVE_MODEL).transform(StmtContextUtils.buildEffective()); + return requiresCtxImpl(stmt, EFFECTIVE_MODEL).transform(StmtContextUtils.buildEffective()); } @Override @@ -205,7 +205,7 @@ class ModifierImpl implements ModelActionBuilder { public , N extends StatementNamespace> Prerequisite requiresEffective( final StmtContext context, final Class namespace, final K key) { final AbstractPrerequisite> rawContext = requiresCtxImpl(context, namespace, key, EFFECTIVE_MODEL); - return rawContext.transform(StmtContextUtils.buildEffective()); + return rawContext.transform(StmtContextUtils.buildEffective()); } @@ -213,7 +213,7 @@ class ModifierImpl implements ModelActionBuilder { public > Prerequisite> mutatesNs(final Mutable context, final Class namespace) { try { - return addMutation(new NamespaceMutation(contextImpl(context),namespace)); + return addMutation(new NamespaceMutation<>(contextImpl(context), namespace)); } catch (SourceException e) { throw shouldNotHappenProbablyBug(e); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java index 0b5cb9a095..bff6225ae3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BelongsToStatementImpl.java @@ -99,7 +99,7 @@ public class BelongsToStatementImpl extends AbstractDeclaredStatement private static ModuleIdentifier getModuleIdentifier( final StmtContext.Mutable> belongsToCtx) { String moduleName = belongsToCtx.getStatementArgument(); - return new ModuleIdentifierImpl(moduleName, Optional. absent(), + return new ModuleIdentifierImpl(moduleName, Optional.absent(), Optional.of(SimpleDateFormatUtil.DEFAULT_BELONGS_TO_DATE)); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java index 6bf310158f..fc28e13d11 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ImportStatementDefinition.java @@ -144,8 +144,8 @@ public class ImportStatementDefinition revision = SimpleDateFormatUtil.DEFAULT_DATE_IMP; } - return new ModuleIdentifierImpl(stmt.getStatementArgument(), Optional. absent(), - Optional. of(revision)); + return new ModuleIdentifierImpl(stmt.getStatementArgument(), Optional.absent(), + Optional.of(revision)); } } \ No newline at end of file diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java index ea7b3db986..8e44c5cbe1 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/IncludeStatementImpl.java @@ -103,7 +103,7 @@ public class IncludeStatementImpl extends AbstractDeclaredStatement impl revisionDate = SimpleDateFormatUtil.DEFAULT_DATE_IMP; } - return new ModuleIdentifierImpl(subModuleName, Optional. absent(), Optional. of(revisionDate)); + return new ModuleIdentifierImpl(subModuleName, Optional.absent(), Optional.of(revisionDate)); } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java index 4044d5ebad..1f3722c9f4 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java @@ -104,7 +104,7 @@ public class ModuleStatementSupport extends QNameModule qNameModule = QNameModule.create(moduleNs.get(), revisionDate.orNull()).intern(); ModuleIdentifier moduleIdentifier = new ModuleIdentifierImpl(stmt.getStatementArgument(), - Optional. absent(), revisionDate); + Optional.absent(), revisionDate); stmt.addContext(ModuleNamespace.class, moduleIdentifier, stmt); stmt.addContext(ModuleNamespaceForBelongsTo.class, moduleIdentifier.getName(), stmt); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java index 2a4ab6c9c4..8e43278b36 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/PatternStatementImpl.java @@ -60,7 +60,7 @@ public class PatternStatementImpl extends AbstractDeclaredStatementabsent(), Optional.absent()); + return new PatternConstraintEffectiveImpl(pattern, Optional.absent(), Optional.absent()); } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java index ec614c7952..e86c785187 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SubmoduleStatementImpl.java @@ -98,7 +98,7 @@ public class SubmoduleStatementImpl extends AbstractRootStatement absent(), revisionDate); + Optional.absent(), revisionDate); stmt.addContext(SubmoduleNamespace.class, submoduleIdentifier, stmt); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangValidationBundles.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangValidationBundles.java index 4e70719be1..3c7ec211f7 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangValidationBundles.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangValidationBundles.java @@ -20,7 +20,7 @@ public final class YangValidationBundles { throw new UnsupportedOperationException("Utility class"); } - public static final Set SUPPORTED_REFINE_SUBSTATEMENTS = ImmutableSet.of( + public static final Set SUPPORTED_REFINE_SUBSTATEMENTS = ImmutableSet.of( Rfc6020Mapping.DEFAULT, Rfc6020Mapping.DESCRIPTION, Rfc6020Mapping.REFERENCE, Rfc6020Mapping.CONFIG, Rfc6020Mapping.MANDATORY, Rfc6020Mapping.MUST, Rfc6020Mapping.PRESENCE, Rfc6020Mapping.MIN_ELEMENTS, Rfc6020Mapping.MAX_ELEMENTS); @@ -28,30 +28,30 @@ public final class YangValidationBundles { public static final Map> SUPPORTED_REFINE_TARGETS; static { final Builder> b = ImmutableMap.builder(); - b.put(Rfc6020Mapping.DEFAULT, ImmutableSet.of(Rfc6020Mapping.LEAF, Rfc6020Mapping.CHOICE)); - b.put(Rfc6020Mapping.MANDATORY, ImmutableSet.of( + b.put(Rfc6020Mapping.DEFAULT, ImmutableSet.of(Rfc6020Mapping.LEAF, Rfc6020Mapping.CHOICE)); + b.put(Rfc6020Mapping.MANDATORY, ImmutableSet.of( Rfc6020Mapping.LEAF, Rfc6020Mapping.CHOICE, Rfc6020Mapping.ANYXML)); - b.put(Rfc6020Mapping.PRESENCE, ImmutableSet.of(Rfc6020Mapping.CONTAINER)); - b.put(Rfc6020Mapping.MUST, ImmutableSet.of( + b.put(Rfc6020Mapping.PRESENCE, ImmutableSet.of(Rfc6020Mapping.CONTAINER)); + b.put(Rfc6020Mapping.MUST, ImmutableSet.of( Rfc6020Mapping.CONTAINER, Rfc6020Mapping.LIST, Rfc6020Mapping.LEAF, Rfc6020Mapping.LEAF_LIST, Rfc6020Mapping.ANYXML)); - b.put(Rfc6020Mapping.MIN_ELEMENTS, ImmutableSet.of( + b.put(Rfc6020Mapping.MIN_ELEMENTS, ImmutableSet.of( Rfc6020Mapping.LIST, Rfc6020Mapping.LEAF_LIST)); - b.put(Rfc6020Mapping.MAX_ELEMENTS, ImmutableSet.of( + b.put(Rfc6020Mapping.MAX_ELEMENTS, ImmutableSet.of( Rfc6020Mapping.LIST, Rfc6020Mapping.LEAF_LIST)); SUPPORTED_REFINE_TARGETS = b.build(); } - public static final Set SUPPORTED_AUGMENT_TARGETS = ImmutableSet.of( + public static final Set SUPPORTED_AUGMENT_TARGETS = ImmutableSet.of( Rfc6020Mapping.CONTAINER, Rfc6020Mapping.LIST, Rfc6020Mapping.CASE, Rfc6020Mapping.INPUT, Rfc6020Mapping.OUTPUT, Rfc6020Mapping.NOTIFICATION, Rfc6020Mapping.CHOICE, Rfc6020Mapping.RPC); - public static final Set SUPPORTED_CASE_SHORTHANDS = ImmutableSet.of( + public static final Set SUPPORTED_CASE_SHORTHANDS = ImmutableSet.of( Rfc6020Mapping.CONTAINER, Rfc6020Mapping.LIST, Rfc6020Mapping.LEAF, Rfc6020Mapping.LEAF_LIST, Rfc6020Mapping.ANYXML); - public static final Set SUPPORTED_DATA_NODES = ImmutableSet.of( + public static final Set SUPPORTED_DATA_NODES = ImmutableSet.of( Rfc6020Mapping.CONTAINER, Rfc6020Mapping.LIST, Rfc6020Mapping.LEAF, Rfc6020Mapping.LEAF_LIST, Rfc6020Mapping.ANYXML); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveSchemaContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveSchemaContext.java index 9ec3d8c71d..0a57e04c31 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveSchemaContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/AbstractEffectiveSchemaContext.java @@ -124,7 +124,7 @@ abstract class AbstractEffectiveSchemaContext implements SchemaContext { @Override public Set findModuleByNamespace(final URI namespace) { final Set ret = getNamespaceToModules().get(namespace); - return ret == null ? Collections. emptySet() : ret; + return ret == null ? Collections.emptySet() : ret; } @Override diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveSchemaContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveSchemaContext.java index c76b86f828..f9604c8216 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveSchemaContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveSchemaContext.java @@ -57,9 +57,9 @@ public final class EffectiveSchemaContext extends AbstractEffectiveSchemaContext this.modules = ImmutableSet.copyOf(sortedModuleList); final SetMultimap nsMap = Multimaps.newSetMultimap( - new TreeMap>(), MODULE_SET_SUPPLIER); + new TreeMap<>(), MODULE_SET_SUPPLIER); final SetMultimap nameMap = Multimaps.newSetMultimap( - new TreeMap>(), MODULE_SET_SUPPLIER); + new TreeMap<>(), MODULE_SET_SUPPLIER); Set modIdBuilder = new HashSet<>(); for (Module m : modulesInit) { nameMap.put(m.getName(), m); @@ -89,9 +89,9 @@ public final class EffectiveSchemaContext extends AbstractEffectiveSchemaContext * Invest some quality time in building up lookup tables for both. */ final SetMultimap nsMap = Multimaps.newSetMultimap( - new TreeMap>(), MODULE_SET_SUPPLIER); + new TreeMap<>(), MODULE_SET_SUPPLIER); final SetMultimap nameMap = Multimaps.newSetMultimap( - new TreeMap>(), MODULE_SET_SUPPLIER); + new TreeMap<>(), MODULE_SET_SUPPLIER); Set modIdBuilder = new HashSet<>(); for (Module m : modules) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityEffectiveStatementImpl.java index d6ae604622..610a69dfed 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/IdentityEffectiveStatementImpl.java @@ -30,7 +30,7 @@ public final class IdentityEffectiveStatementImpl extends AbstractEffectiveSchem super(ctx); // initDerivedIdentities - Set derivedIdentitiesInit = new HashSet(); + Set derivedIdentitiesInit = new HashSet<>(); List> derivedIdentitiesCtxList = ctx.getFromNamespace( DerivedIdentitiesNamespace.class, ctx.getStatementArgument()); if (derivedIdentitiesCtxList == null) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java index c34a8f4218..b74b9fcf69 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySort.java @@ -94,7 +94,7 @@ public final class ModuleDependencySort { @Deprecated public static List sort(final Collection builders) { List sorted = sortInternal(ModuleOrModuleBuilder.fromAll( - Collections.emptySet(),builders)); + Collections.emptySet(),builders)); return Lists.transform(sorted, NODE_TO_MODULEBUILDER); } @@ -129,7 +129,7 @@ public final class ModuleDependencySort { */ public static List sort(final Module... modules) { List sorted = sortInternal(ModuleOrModuleBuilder.fromAll(asList(modules), - Collections.emptyList())); + Collections.emptyList())); // Cast to Module from Node and return return Lists.transform(sorted, TOPOLOGY_FUNCTION); } @@ -300,7 +300,7 @@ public final class ModuleDependencySort { } if (moduleGraph.get(name) == null) { - moduleGraph.put(name, Maps. newHashMap()); + moduleGraph.put(name, Maps.newHashMap()); } if (moduleGraph.get(name).get(rev) != null) { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtilsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtilsTest.java index 7573e934a5..11a3f84261 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtilsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtilsTest.java @@ -390,7 +390,7 @@ public class BuilderUtilsTest { @Test public void testFindIdentity() { - assertNull(BuilderUtils.findIdentity(Collections.emptySet(), "test-identity")); + assertNull(BuilderUtils.findIdentity(Collections.emptySet(), "test-identity")); } @Test diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationTest.java index 05d7a64853..1fb4303b02 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangModelValidationTest.java @@ -139,7 +139,7 @@ public class YangModelValidationTest { @Test public void testIdentifierMatching() { - List ids = new ArrayList(); + List ids = new ArrayList<>(); // valid ids.add("_ok98-.87.-.8...88-asdAD"); ids.add("AA.bcd"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java index ea910c6211..a8da2ba4f2 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java @@ -822,7 +822,7 @@ public class YangParserTest { File dependenciesDir = new File(getClass().getResource("/sorting-test").toURI()); YangContextParser parser = new YangParserImpl(); modules = parser.parseFile(yangFile, dependenciesDir).getModules(); - SchemaContext ctx = new SchemaContextImpl(modules, Collections. emptyMap()); + SchemaContext ctx = new SchemaContextImpl(modules, Collections.emptyMap()); checkOrder(modules); assertSetEquals(modules, ctx.getModules()); @@ -839,12 +839,12 @@ public class YangParserTest { } Set newModules = parser.parseFiles(testFiles).getModules(); assertSetEquals(newModules, modules); - ctx = new SchemaContextImpl(newModules, Collections. emptyMap()); + ctx = new SchemaContextImpl(newModules, Collections.emptyMap()); assertSetEquals(newModules, ctx.getModules()); // ########## newModules = parser.parseFiles(testFiles, null).getModules(); assertSetEquals(newModules, modules); - ctx = new SchemaContextImpl(newModules, Collections. emptyMap()); + ctx = new SchemaContextImpl(newModules, Collections.emptyMap()); assertSetEquals(newModules, ctx.getModules()); // ########## List streams = new ArrayList<>(); @@ -853,7 +853,7 @@ public class YangParserTest { } newModules = parser.parseSources(BuilderUtils.filesToByteSources(testFiles)).getModules(); assertSetEquals(newModules, modules); - ctx = new SchemaContextImpl(newModules, Collections. emptyMap()); + ctx = new SchemaContextImpl(newModules, Collections.emptyMap()); assertSetEquals(newModules, ctx.getModules()); // ########## streams.clear(); @@ -862,7 +862,7 @@ public class YangParserTest { } newModules = parser.parseSources(BuilderUtils.filesToByteSources(testFiles), null).getModules(); assertSetEquals(newModules, modules); - ctx = new SchemaContextImpl(newModules, Collections. emptyMap()); + ctx = new SchemaContextImpl(newModules, Collections.emptyMap()); assertSetEquals(newModules, ctx.getModules()); } @@ -930,7 +930,7 @@ public class YangParserTest { File yangSubmodul = new File(getClass().getResource("/yang-grammar-test/submodule-header-extension.yang") .toURI()); - List yangs = new ArrayList(); + List yangs = new ArrayList<>(); yangs.add(yangModul); yangs.add(yangSubmodul); @@ -948,7 +948,7 @@ public class YangParserTest { File yangModule2 = new File(getClass().getResource("/yang-grammar-test/stmtsep-in-statements2.yang").toURI()); File yangSubModule = new File(getClass().getResource("/yang-grammar-test/stmtsep-in-statements-sub.yang").toURI()); - List yangs = new ArrayList(); + List yangs = new ArrayList<>(); yangs.add(yangModule1); yangs.add(yangModule2); yangs.add(yangSubModule); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java index 21447aa1e7..ec3ed1253d 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java @@ -44,14 +44,14 @@ public class SharedSchemaContextFactoryTest { repository.registerSchemaSource(new SchemaSourceProvider() { @Override public CheckedFuture getSource(final SourceIdentifier sourceIdentifier) { - return Futures.immediateCheckedFuture(source1); + return Futures.immediateCheckedFuture(source1); } }, PotentialSchemaSource.create(s1, YangTextSchemaSource.class, 1)); repository.registerSchemaSource(new SchemaSourceProvider() { @Override public CheckedFuture getSource(final SourceIdentifier sourceIdentifier) { - return Futures.immediateCheckedFuture(source2); + return Futures.immediateCheckedFuture(source2); } }, PotentialSchemaSource.create(s2, YangTextSchemaSource.class, 1)); } 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 7e2ca26508..4e280160f2 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 @@ -247,7 +247,7 @@ public class SharedSchemaRepositoryTest { } }; assertThat(Collections2.transform(listener.registeredSources, potSourceToSID), - both(hasItem(new SourceIdentifier("test", Optional.absent()))) + both(hasItem(new SourceIdentifier("test", Optional.absent()))) .and(hasItem(new SourceIdentifier("test", Optional.of("2012-12-12")))) .and(hasItem(new SourceIdentifier("test", Optional.of("2013-12-12")))) .and(hasItem(new SourceIdentifier("module", Optional.of("2010-12-12")))) @@ -268,7 +268,7 @@ public class SharedSchemaRepositoryTest { sharedSchemaRepository.registerSchemaSource(new SchemaSourceProvider() { @Override public CheckedFuture getSource(final SourceIdentifier sourceIdentifier) { - return Futures.immediateCheckedFuture(new YangTextSchemaSource(runningId) { + return Futures.immediateCheckedFuture(new YangTextSchemaSource(runningId) { @Override protected MoreObjects.ToStringHelper addToStringAttributes(final MoreObjects.ToStringHelper toStringHelper) { return toStringHelper; diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java index 96d81e6157..62468893ec 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/ModuleDependencySortTest.java @@ -52,7 +52,7 @@ public class ModuleDependencySortTest { List l = ModuleDependencySort.sort(builders); assertDependencyGraph(ModuleDependencySort.createModuleGraph(ModuleOrModuleBuilder.fromAll( - Collections.emptySet(), Arrays.asList(builders)))); + Collections.emptySet(), Arrays.asList(builders)))); Matcher cOrD = anyOf(equalTo(c.getName()), equalTo(d.getName())); -- 2.36.6