From 82af449e4ef07d80490e79484d0402b81009541e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 2 Jun 2016 19:41:30 +0200 Subject: [PATCH] Scripted update of if statements These trigger checkstyle warnings, hence turn both 'if( ' and 'if(' into proper 'if ('. Same for for and while. Change-Id: I78714d3370806cccc3f42ae9a15d4d14ba1361c3 Signed-off-by: Robert Varga --- .../yangtools/util/ExecutorServiceUtil.java | 4 +- .../concurrent/CachedThreadPoolExecutor.java | 2 +- .../concurrent/QueuedNotificationManager.java | 44 +++++++++---------- .../TrackingLinkedBlockingQueue.java | 4 +- ...NotifyingListeningExecutorServiceTest.java | 8 ++-- .../util/concurrent/CommonTestUtils.java | 6 +-- .../CountingRejectedExecutionHandlerTest.java | 6 +-- ...DetectingListeningExecutorServiceTest.java | 4 +- .../concurrent/MappingCheckedFutureTest.java | 8 ++-- .../QueuedNotificationManagerTest.java | 22 +++++----- .../concurrent/ThreadPoolExecutorTest.java | 32 +++++++------- .../schema/stream/NormalizedNodeWriter.java | 8 ++-- .../data/api/schema/tree/StoreTreeNodes.java | 2 +- .../gson/JSONNormalizedNodeStreamWriter.java | 2 +- .../data/codec/gson/JsonParserStream.java | 2 +- .../yang/data/codec/gson/TestUtils.java | 2 +- .../yang/data/impl/codec/SchemaTracker.java | 20 ++++----- .../XMLStreamNormalizedNodeStreamWriter.java | 4 +- .../data/impl/codec/xml/XmlDocumentUtils.java | 2 +- .../data/impl/codec/xml/XmlStreamUtils.java | 2 +- .../LeafRefPathParserListenerImpl.java | 2 +- .../impl/leafref/LeafRefValidatation.java | 2 +- .../ImmutableNormalizedNodeStreamWriter.java | 2 +- .../data/impl/schema/InstanceIdToNodes.java | 4 +- .../impl/schema/InstanceIdToSimpleNodes.java | 2 +- .../SchemaOrderedNormalizedNodeWriter.java | 2 +- .../yang/data/impl/schema/SchemaUtils.java | 22 +++++----- ...ImmutableChoiceNodeSchemaAwareBuilder.java | 2 +- .../impl/ImmutableMapEntryNodeBuilder.java | 4 +- .../valid/DataNodeContainerValidator.java | 4 +- .../impl/schema/transform/dom/DomUtils.java | 4 +- .../AugmentationModificationStrategy.java | 2 +- .../tree/ChoiceModificationStrategy.java | 2 +- .../tree/InMemoryDataTreeModification.java | 2 +- .../tree/SchemaAwareApplyOperation.java | 6 +-- .../TypeDefinitionAwareCodecTestHelper.java | 4 +- .../data/impl/schema/tree/Bug4454Test.java | 2 +- .../yangtools/yang/data/jaxen/TestUtils.java | 2 +- .../data/util/ListNodeDataWithSchema.java | 2 +- .../yang/data/util/RpcAsContainer.java | 4 +- ...XpathStringParsingPathArgumentBuilder.java | 14 +++--- .../plugin/YangToSourcesProcessor.java | 2 +- .../yang/model/export/ExtensionStatement.java | 2 +- .../model/export/SchemaContextEmitter.java | 16 +++---- .../SingleModuleYinStatementWriter.java | 10 ++--- .../yang/model/export/YinExportUtils.java | 6 +-- .../util/FilesystemSchemaSourceCache.java | 10 ++--- .../yang/model/util/DerivedType.java | 8 ++-- .../yang/model/util/EnumerationType.java | 2 +- .../util/FilteringSchemaContextProxy.java | 6 +-- .../yang/model/util/SchemaContextUtil.java | 4 +- .../yang/model/util/SchemaNodeUtils.java | 4 +- .../model/util/SchemaContextProxyTest.java | 8 ++-- .../parser/builder/impl/ModuleBuilder.java | 2 +- .../yang/parser/builder/impl/RefineUtils.java | 8 ++-- .../yang/parser/impl/ParserListenerUtils.java | 4 +- .../yang/parser/repo/DependencyResolver.java | 2 +- .../parser/spi/meta/NamespaceBehaviour.java | 2 +- .../stmt/reactor/BuildGlobalContext.java | 2 +- .../parser/stmt/reactor/ModifierImpl.java | 4 +- .../NamespaceBehaviourWithListeners.java | 2 +- .../stmt/reactor/NamespaceStorageSupport.java | 6 +-- .../stmt/reactor/RootStatementContext.java | 2 +- .../stmt/reactor/SourceSpecificContext.java | 2 +- .../stmt/reactor/StatementContextWriter.java | 2 +- .../stmt/reactor/SubstatementContext.java | 2 +- .../parser/stmt/rfc6020/AugmentUtils.java | 2 +- .../parser/stmt/rfc6020/ChildSchemaNodes.java | 2 +- .../SchemaNodeIdentifierBuildNamespace.java | 8 ++-- .../stmt/rfc6020/YangStatementSourceImpl.java | 2 +- .../effective/EffectiveStatementBase.java | 2 +- .../ExtensionEffectiveStatementImpl.java | 2 +- .../parser/util/ModuleOrModuleBuilder.java | 2 +- .../yangtools/yang/stmt/UsesAugmentTest.java | 10 ++--- 74 files changed, 211 insertions(+), 211 deletions(-) diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java index 51a8d16f84..cfa4306439 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ExecutorServiceUtil.java @@ -26,7 +26,7 @@ public final class ExecutorServiceUtil { private static final class WaitInQueueExecutionHandler implements RejectedExecutionHandler { @Override public void rejectedExecution(final Runnable r, final ThreadPoolExecutor executor) { - if( executor.isShutdown() ) { + if (executor.isShutdown() ) { throw new RejectedExecutionException( "Executor has been shutdown." ); } @@ -90,7 +90,7 @@ public final class ExecutorServiceUtil { executor.shutdown(); try { - if(!executor.awaitTermination(timeout, unit)) { + if (!executor.awaitTermination(timeout, unit)) { executor.shutdownNow(); } } catch( InterruptedException e ) { diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/CachedThreadPoolExecutor.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/CachedThreadPoolExecutor.java index e7672ac458..7f2e77f731 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/CachedThreadPoolExecutor.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/CachedThreadPoolExecutor.java @@ -164,7 +164,7 @@ public class CachedThreadPoolExecutor extends ThreadPoolExecutor { task = super.poll( waitTime, TimeUnit.MILLISECONDS ); totalWaitTime -= POLL_WAIT_TIME_IN_MS; - if( totalWaitTime <= 0 ) { + if (totalWaitTime <= 0 ) { break; } diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManager.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManager.java index f4846f8fce..502db34ca8 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManager.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManager.java @@ -107,7 +107,7 @@ public class QueuedNotificationManager implements NotificationManager public void submitNotification( final L listener, final N notification ) throws RejectedExecutionException { - if( notification == null ) { + if (notification == null) { return; } @@ -121,11 +121,11 @@ public class QueuedNotificationManager implements NotificationManager public void submitNotifications( final L listener, final Iterable notifications ) throws RejectedExecutionException { - if( notifications == null || listener == null ) { + if (notifications == null || listener == null) { return; } - if( LOG.isTraceEnabled() ) { + if (LOG.isTraceEnabled()) { LOG.trace( "{}: submitNotifications for listener {}: {}", name, listener.toString(), notifications ); } @@ -138,10 +138,10 @@ public class QueuedNotificationManager implements NotificationManager // will occur. try { - while( true ) { + while (true) { NotificationTask existingTask = listenerCache.get( key ); - if( existingTask == null || !existingTask.submitNotifications( notifications ) ) { + if (existingTask == null || !existingTask.submitNotifications( notifications )) { // Either there's no existing task or we couldn't add our notifications to the // existing one because it's in the process of exiting and removing itself from @@ -151,12 +151,12 @@ public class QueuedNotificationManager implements NotificationManager // shouldn't be called concurrently for the same listener as that would violate // notification ordering. In any case loop back up and try again. - if( newNotificationTask == null ) { + if (newNotificationTask == null) { newNotificationTask = new NotificationTask( key, notifications ); } existingTask = listenerCache.putIfAbsent( key, newNotificationTask ); - if( existingTask == null ) { + if (existingTask == null) { // We were able to put our new task - now submit it to the executor and // we're done. If it throws a RejectedxecutionException, let that propagate @@ -184,7 +184,7 @@ public class QueuedNotificationManager implements NotificationManager name, listener.toString() ); } - if( LOG.isTraceEnabled() ) { + if (LOG.isTraceEnabled()) { LOG.trace( "{}: submitNotifications dine for listener {}", name, listener.toString() ); } @@ -196,7 +196,7 @@ public class QueuedNotificationManager implements NotificationManager */ public List getListenerNotificationQueueStats() { List statsList = new ArrayList<>( listenerCache.size() ); - for( NotificationTask task: listenerCache.values() ) { + for (NotificationTask task: listenerCache.values()) { statsList.add( new ListenerNotificationQueueStats( task.listenerKey.toString(), task.notificationQueue.size() ) ); } @@ -283,7 +283,7 @@ public class QueuedNotificationManager implements NotificationManager this.listenerKey = listenerKey; this.notificationQueue = new LinkedBlockingQueue<>( maxQueueCapacity ); - for( N notification: notifications ) { + for (N notification: notifications) { this.notificationQueue.add( notification ); } } @@ -296,24 +296,24 @@ public class QueuedNotificationManager implements NotificationManager // Check the done flag - if true then #run is in the process of exiting so return // false to indicate such. Otherwise, offer the notifications to the queue. - if( done ) { + if (done) { return false; } - for( N notification: notifications ) { + for (N notification: notifications) { boolean notificationOfferAttemptSuccess = false; // The offer is attempted for up to 10 minutes, with a status message printed each minute for (int notificationOfferAttempts = 0; - notificationOfferAttempts < MAX_NOTIFICATION_OFFER_ATTEMPTS; notificationOfferAttempts++ ) { + notificationOfferAttempts < MAX_NOTIFICATION_OFFER_ATTEMPTS; notificationOfferAttempts++) { // Try to offer for up to a minute and log a message if it times out. - if( LOG.isDebugEnabled() ) { + if (LOG.isDebugEnabled()) { LOG.debug( "{}: Offering notification to the queue for listener {}: {}", name, listenerKey.toString(), notification ); } - if( notificationOfferAttemptSuccess = notificationQueue.offer( - notification, 1, TimeUnit.MINUTES ) ) { + if (notificationOfferAttemptSuccess = notificationQueue.offer( + notification, 1, TimeUnit.MINUTES)) { break; } @@ -353,19 +353,19 @@ public class QueuedNotificationManager implements NotificationManager try { // Loop until we've dispatched all the notifications in the queue. - while( true ) { + while (true) { // Get the notification at the head of the queue, waiting a little bit for one // to get offered. N notification = notificationQueue.poll( 10, TimeUnit.MILLISECONDS ); - if( notification == null ) { + if (notification == null) { // The queue is empty - try to get the queuingLock. If we can't get the lock // then #submitNotifications is in the process of offering to the queue so // we'll loop back up and poll the queue again. - if( queuingLock.tryLock() ) { + if (queuingLock.tryLock()) { try { // Check the queuedNotifications flag to see if #submitNotifications @@ -374,7 +374,7 @@ public class QueuedNotificationManager implements NotificationManager // Once we set the done flag and unlock, calls to // #submitNotifications will fail and a new task will be created. - if( !queuedNotifications ) { + if (!queuedNotifications) { done = true; break; } @@ -408,13 +408,13 @@ public class QueuedNotificationManager implements NotificationManager private void notifyListener( N notification ) { - if( notification == null ) { + if (notification == null) { return; } try { - if( LOG.isDebugEnabled() ) { + if (LOG.isDebugEnabled()) { LOG.debug( "{}: Invoking listener {} with notification: {}", name, listenerKey.toString(), notification ); } diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/TrackingLinkedBlockingQueue.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/TrackingLinkedBlockingQueue.java index 33ffb78887..5e2858220d 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/TrackingLinkedBlockingQueue.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/TrackingLinkedBlockingQueue.java @@ -66,7 +66,7 @@ public class TrackingLinkedBlockingQueue extends LinkedBlockingQueue { @Override public boolean offer( final E e, final long timeout, final TimeUnit unit ) throws InterruptedException { - if( super.offer( e, timeout, unit ) ) { + if (super.offer( e, timeout, unit ) ) { updateLargestQueueSize(); return true; } @@ -76,7 +76,7 @@ public class TrackingLinkedBlockingQueue extends LinkedBlockingQueue { @Override public boolean offer( final E e ) { - if( super.offer( e ) ) { + if (super.offer( e ) ) { updateLargestQueueSize(); return true; } diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListeningExecutorServiceTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListeningExecutorServiceTest.java index 1a3bf0d4fd..15c9162ddd 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListeningExecutorServiceTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListeningExecutorServiceTest.java @@ -50,11 +50,11 @@ public class AsyncNotifyingListeningExecutorServiceTest { @After public void tearDown() { - if( listenerExecutor != null ) { + if (listenerExecutor != null ) { listenerExecutor.shutdownNow(); } - if( testExecutor != null ) { + if (testExecutor != null ) { testExecutor.shutdownNow(); } } @@ -113,7 +113,7 @@ public class AsyncNotifyingListeningExecutorServiceTest { assertTrue( "ListenableFuture callback was not notified of onSuccess", futureNotifiedLatch.await( 5, TimeUnit.SECONDS ) ); - if( assertError.get() != null ) { + if (assertError.get() != null ) { throw assertError.get(); } @@ -126,7 +126,7 @@ public class AsyncNotifyingListeningExecutorServiceTest { assertTrue( "ListenableFuture callback was not notified of onSuccess", futureNotifiedLatch.await( 5, TimeUnit.SECONDS ) ); - if( assertError.get() != null ) { + if (assertError.get() != null ) { throw assertError.get(); } } diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java index 584c8674c3..330fc01e95 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java @@ -33,7 +33,7 @@ public class CommonTestUtils { return executor.submit( new Callable() { @Override public Void call() throws Exception { - if( blockingLatch != null ) { + if (blockingLatch != null ) { Uninterruptibles.awaitUninterruptibly( blockingLatch ); } return null; @@ -49,7 +49,7 @@ public class CommonTestUtils { return executor.submit( new Runnable() { @Override public void run() { - if( blockingLatch != null ) { + if (blockingLatch != null ) { Uninterruptibles.awaitUninterruptibly( blockingLatch ); } } @@ -64,7 +64,7 @@ public class CommonTestUtils { return executor.submit( new Runnable() { @Override public void run() { - if( blockingLatch != null ) { + if (blockingLatch != null ) { Uninterruptibles.awaitUninterruptibly( blockingLatch ); } } 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 8c45dc25bb..7abc688cff 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 @@ -33,7 +33,7 @@ public class CountingRejectedExecutionHandlerTest { @After public void tearDown() { - if( executor != null ) { + if (executor != null) { executor.shutdownNow(); } } @@ -54,7 +54,7 @@ public class CountingRejectedExecutionHandlerTest { executor.execute( new Task( tasksRunLatch, blockLatch ) ); - for( int i = 0; i < nTasks - 1; i++ ) { + for (int i = 0; i < nTasks - 1; i++) { executor.execute( new Task( null, null, null, null, 0 ) ); } @@ -81,7 +81,7 @@ public class CountingRejectedExecutionHandlerTest { executor.execute( new Task( tasksRunLatch, blockLatch ) ); - for( int i = 0; i < nTasks - 1; i++ ) { + for (int i = 0; i < nTasks - 1; i++) { try { executor.execute( new Task( null, null, null, null, 0 ) ); fail( "Expected RejectedExecutionException" ); diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java index 8e50b5873f..49da278489 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java @@ -77,7 +77,7 @@ public class DeadlockDetectingListeningExecutorServiceTest { @After public void tearDown() { - if( executor != null ) { + if (executor != null ) { executor.shutdownNow(); } } @@ -166,7 +166,7 @@ public class DeadlockDetectingListeningExecutorServiceTest { assertTrue( "Task did not complete - executor likely deadlocked", futureCompletedLatch.await( 5, TimeUnit.SECONDS ) ); - if( caughtEx.get() != null ) { + if (caughtEx.get() != null ) { throw caughtEx.get(); } } diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFutureTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFutureTest.java index e9cf1beee3..5087f15895 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFutureTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/MappingCheckedFutureTest.java @@ -59,7 +59,7 @@ public class MappingCheckedFutureTest { @Override public Throwable extractWrappedTestEx( final Exception from ) { - if( from instanceof ExecutionException ) { + if (from instanceof ExecutionException ) { return ((ExecutionException)from).getCause(); } @@ -75,7 +75,7 @@ public class MappingCheckedFutureTest { @Override public Throwable extractWrappedTestEx( final Exception from ) { - if( from instanceof ExecutionException ) { + if (from instanceof ExecutionException ) { return ((ExecutionException)from).getCause(); } @@ -174,7 +174,7 @@ public class MappingCheckedFutureTest { assertNotNull( "Expected returned exception is null", expectedTestEx ); assertEquals( "Exception type", TestException.class, expectedTestEx.getClass() ); - if( cause instanceof TestException ) { + if (cause instanceof TestException ) { assertNull( "Expected null cause", expectedTestEx.getCause() ); } else { assertSame( "TestException cause", cause, expectedTestEx.getCause() ); @@ -241,7 +241,7 @@ public class MappingCheckedFutureTest { thread.interrupt(); assertEquals( "get call completed", true, doneLatch.await( 5, TimeUnit.SECONDS ) ); - if( assertError.get() != null ) { + if (assertError.get() != null ) { throw assertError.get(); } } 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 455ccdd1b0..684797d4da 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 @@ -61,22 +61,22 @@ public class QueuedNotificationManagerTest { void onNotification( N data ) { try { - if( sleepTime > 0 ) { + if (sleepTime > 0) { Uninterruptibles.sleepUninterruptibly( sleepTime, TimeUnit.MILLISECONDS ); } - if( cacheNotifications ) { + if (cacheNotifications) { actual.add( data ); } RuntimeException localRuntimeEx = runtimeEx; - if( localRuntimeEx != null ) { + if (localRuntimeEx != null) { runtimeEx = null; throw localRuntimeEx; } Error localJvmError = jvmError; - if( localJvmError != null ) { + if (localJvmError != null) { jvmError = null; throw localJvmError; } @@ -88,7 +88,7 @@ public class QueuedNotificationManagerTest { void verifyNotifications() { boolean done = Uninterruptibles.awaitUninterruptibly( latch, 10, TimeUnit.SECONDS ); - if( !done ) { + if (!done) { long actualCount = latch.getCount(); fail( name + ": Received " + (expCount - actualCount) + " notifications. Expected " + expCount ); @@ -138,7 +138,7 @@ public class QueuedNotificationManagerTest { @After public void tearDown() { - if( queueExecutor != null ) { + if (queueExecutor != null) { queueExecutor.shutdownNow(); } } @@ -172,7 +172,7 @@ public class QueuedNotificationManagerTest { List expNotifications = Lists.newArrayListWithCapacity( nNotifications ); expNotifications.addAll( Arrays.asList( 1, 2, 3, 4, 5, 6 ) ); - for( int i = 1; i <= nNotifications - initialCount; i++ ) { + for (int i = 1; i <= nNotifications - initialCount; i++) { Integer v = Integer.valueOf( initialCount + i ); expNotifications.add( v ); manager.submitNotification( listener, v ); @@ -197,14 +197,14 @@ public class QueuedNotificationManagerTest { " notifications each..." ); final Integer[] notifications = new Integer[nNotifications]; - for( int i = 1; i <= nNotifications; i++ ) { + for (int i = 1; i <= nNotifications; i++) { notifications[i-1] = Integer.valueOf( i ); } Stopwatch stopWatch = Stopwatch.createStarted(); List> listeners = Lists.newArrayList(); - for( int i = 1; i <= nListeners; i++ ) { + for (int i = 1; i <= nListeners; i++) { final TestListener listener = i == 2 ? new TestListener2<>(nNotifications, i) : i == 3 ? new TestListener3<>(nNotifications, i) : @@ -214,7 +214,7 @@ public class QueuedNotificationManagerTest { new Thread( new Runnable() { @Override public void run() { - for( int j = 1; j <= nNotifications; j++ ) { + for (int j = 1; j <= nNotifications; j++) { final Integer n = notifications[j-1]; stagingExecutor.execute( new Runnable() { @Override @@ -228,7 +228,7 @@ public class QueuedNotificationManagerTest { } try { - for( TestListener listener: listeners ) { + for (TestListener listener: listeners) { listener.verifyNotifications(); System.out.println( listener.name + " succeeded" ); } diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/ThreadPoolExecutorTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/ThreadPoolExecutorTest.java index 71258b87ad..c9b3dab188 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/ThreadPoolExecutorTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/ThreadPoolExecutorTest.java @@ -36,7 +36,7 @@ public class ThreadPoolExecutorTest { @After public void tearDown() { - if( executor != null ) { + if (executor != null) { executor.shutdownNow(); } } @@ -54,7 +54,7 @@ public class ThreadPoolExecutorTest { executor = SpecialExecutors.newBoundedFastThreadPool( 1, 1, "TestPool" ); - for( int i = 0; i < 5; i++ ) { + for (int i = 0; i < 5; i++) { executor.execute( new Task( null, null, null, null, TimeUnit.MICROSECONDS.convert( 5, TimeUnit.SECONDS ) ) ); } @@ -82,7 +82,7 @@ public class ThreadPoolExecutorTest { ExecutorService executor = SpecialExecutors.newBoundedCachedThreadPool( 1, 1, "TestPool" ); - for( int i = 0; i < 5; i++ ) { + for (int i = 0; i < 5; i++) { executor.execute( new Task( null, null, null, null, TimeUnit.MICROSECONDS.convert( 5, TimeUnit.SECONDS ) ) ); } @@ -113,8 +113,8 @@ public class ThreadPoolExecutorTest { new Thread() { @Override public void run() { - for( int i = 0; i < numTasksToRun; i++ ) { -// if(i%100 == 0) { + for (int i = 0; i < numTasksToRun; i++) { +// if (i%100 == 0) { // Uninterruptibles.sleepUninterruptibly( 20, TimeUnit.MICROSECONDS ); // } @@ -128,17 +128,17 @@ public class ThreadPoolExecutorTest { stopWatch.stop(); - if( !done ) { + if (!done) { fail( (numTasksToRun - tasksRunLatch.getCount()) + " tasks out of " + numTasksToRun + " executed" ); } - if( threadError.get() != null ) { + if (threadError.get() != null) { throw threadError.get(); } System.out.println( taskCountPerThread.size() + " threads used:" ); - for( Map.Entry e : taskCountPerThread.entrySet() ) { + for (Map.Entry e : taskCountPerThread.entrySet()) { System.out.println( " " + e.getKey().getName() + " - " + e.getValue() + " tasks" ); } @@ -178,24 +178,24 @@ public class ThreadPoolExecutorTest { public void run() { try { try { - if( delay > 0 ) { + if (delay > 0) { TimeUnit.MICROSECONDS.sleep( delay ); - } else if( blockLatch != null ) { + } else if (blockLatch != null) { blockLatch.await(); } } catch( InterruptedException e ) {} - if( expThreadPrefix != null ) { + if (expThreadPrefix != null) { assertEquals( "Thread name starts with " + expThreadPrefix, true, Thread.currentThread().getName().startsWith( expThreadPrefix ) ); } - if( taskCountPerThread != null ) { + if (taskCountPerThread != null) { AtomicLong count = taskCountPerThread.get( Thread.currentThread() ); - if( count == null ) { + if (count == null) { count = new AtomicLong( 0 ); AtomicLong prev = taskCountPerThread.putIfAbsent( Thread.currentThread(), count ); - if( prev != null ) { + if (prev != null) { count = prev; } } @@ -204,11 +204,11 @@ public class ThreadPoolExecutorTest { } } catch( AssertionError e ) { - if( threadError != null ) { + if (threadError != null) { threadError.set( e ); } } finally { - if( tasksRunLatch != null ) { + if (tasksRunLatch != null) { tasksRunLatch.countDown(); } } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java index 61bae7c4e8..be22c5091a 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java @@ -137,7 +137,7 @@ public class NormalizedNodeWriter implements Closeable, Flushable { if (node instanceof LeafSetEntryNode) { final LeafSetEntryNode nodeAsLeafList = (LeafSetEntryNode)node; final QName name = nodeAsLeafList.getIdentifier().getNodeType(); - if(writer instanceof NormalizedNodeStreamAttributeWriter) { + if (writer instanceof NormalizedNodeStreamAttributeWriter) { ((NormalizedNodeStreamAttributeWriter) writer).leafSetEntryNode(name, nodeAsLeafList.getValue(), nodeAsLeafList.getAttributes()); } else { @@ -146,7 +146,7 @@ public class NormalizedNodeWriter implements Closeable, Flushable { return true; } else if (node instanceof LeafNode) { final LeafNode nodeAsLeaf = (LeafNode)node; - if(writer instanceof NormalizedNodeStreamAttributeWriter) { + if (writer instanceof NormalizedNodeStreamAttributeWriter) { ((NormalizedNodeStreamAttributeWriter) writer).leafNode(nodeAsLeaf.getIdentifier(), nodeAsLeaf.getValue(), nodeAsLeaf.getAttributes()); } else { writer.leafNode(nodeAsLeaf.getIdentifier(), nodeAsLeaf.getValue()); @@ -190,7 +190,7 @@ public class NormalizedNodeWriter implements Closeable, Flushable { protected boolean wasProcessedAsCompositeNode(final NormalizedNode node) throws IOException { if (node instanceof ContainerNode) { final ContainerNode n = (ContainerNode) node; - if(writer instanceof NormalizedNodeStreamAttributeWriter) { + if (writer instanceof NormalizedNodeStreamAttributeWriter) { ((NormalizedNodeStreamAttributeWriter) writer).startContainerNode(n.getIdentifier(), childSizeHint(n.getValue()), n.getAttributes()); } else { writer.startContainerNode(n.getIdentifier(), childSizeHint(n.getValue())); @@ -263,7 +263,7 @@ public class NormalizedNodeWriter implements Closeable, Flushable { @Override protected boolean writeMapEntryNode(final MapEntryNode node) throws IOException { final NormalizedNodeStreamWriter nnWriter = getWriter(); - if(nnWriter instanceof NormalizedNodeStreamAttributeWriter) { + if (nnWriter instanceof NormalizedNodeStreamAttributeWriter) { ((NormalizedNodeStreamAttributeWriter) nnWriter).startMapEntryNode(node.getIdentifier(), childSizeHint(node.getValue()), node.getAttributes()); } else { nnWriter.startMapEntryNode(node.getIdentifier(), childSizeHint(node.getValue())); 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 0fb94c54ac..33584640c5 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 @@ -48,7 +48,7 @@ public final class StoreTreeNodes { T current = tree; int i = 1; - for(PathArgument pathArg : path.getPathArguments()) { + for (PathArgument pathArg : path.getPathArguments()) { Optional potential = current.getChild(pathArg); if (!potential.isPresent()) { throw new IllegalArgumentException(String.format("Child %s is not present in tree.", diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java index e5dc228b33..b869f5c399 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java @@ -198,7 +198,7 @@ public final class JSONNormalizedNodeStreamWriter implements NormalizedNodeStrea tracker.endNode(); context = context.endNode(codecs.getSchemaContext(), writer); - if(context instanceof JSONStreamWriterRootContext) { + if (context instanceof JSONStreamWriterRootContext) { context.emitEnd(writer); } } diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java index 99ac2809bd..275a90dde0 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java @@ -159,7 +159,7 @@ public final class JsonParserStream implements Closeable, Flushable { * without wrapping array. * */ - if(isArray(parent)) { + if (isArray(parent)) { parent = newArrayEntry(parent); } while (in.hasNext()) { 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 0e13ecbbfe..e9105db7b9 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 @@ -69,7 +69,7 @@ public class TestUtils { StatementStreamSource[] sources = new StatementStreamSource[files.length]; - for(int i = 0; i realChildSchemas = new HashSet<>(); - for(final DataSchemaNode child : schema.getChildNodes()) { + for (final DataSchemaNode child : schema.getChildNodes()) { realChildSchemas.add(((DataNodeContainer) parent).getDataChildByName(child.getQName())); } final AugmentationSchema resolvedSchema = new EffectiveAugmentationSchema(schema, realChildSchemas); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java index 99f1507965..987f510c1f 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java @@ -121,7 +121,7 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz private void writeStartElement(final QName qname) throws XMLStreamException { String ns = qname.getNamespace().toString(); writer.writeStartElement(XMLConstants.DEFAULT_NS_PREFIX, qname.getLocalName(), ns); - if(writer.getNamespaceContext() != null) { + if (writer.getNamespaceContext() != null) { String parentNs = writer.getNamespaceContext().getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX); if (!ns.equals(parentNs)) { writer.writeDefaultNamespace(ns); @@ -200,7 +200,7 @@ public abstract class XMLStreamNormalizedNodeStreamWriter implements Normaliz try { final String namespace = qNameStringEntry.getKey().getNamespace().toString(); - if(Strings.isNullOrEmpty(namespace)) { + if (Strings.isNullOrEmpty(namespace)) { writer.writeAttribute(qNameStringEntry.getKey().getLocalName(), qNameStringEntry.getValue()); } else { final String prefix = randomPrefix.encodePrefix(qNameStringEntry.getKey().getNamespace()); 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 bdfb928ff7..f05cc7a7f8 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 @@ -80,7 +80,7 @@ public final class XmlDocumentUtils { public static Optional getModifyOperationFromAttributes(final Element xmlElement) { Attr attributeNodeNS = xmlElement.getAttributeNodeNS(OPERATION_ATTRIBUTE_QNAME.getNamespace().toString(), OPERATION_ATTRIBUTE_QNAME.getLocalName()); - if(attributeNodeNS == null) { + if (attributeNodeNS == null) { return Optional.absent(); } 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 dfce4751b0..a54b44134a 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 @@ -205,7 +205,7 @@ public class XmlStreamUtils { } public void writeInstanceIdentifier(final XMLStreamWriter writer, final YangInstanceIdentifier value) throws XMLStreamException { - if(schemaContext.isPresent()) { + if (schemaContext.isPresent()) { RandomPrefixInstanceIdentifierSerializer iiCodec = new RandomPrefixInstanceIdentifierSerializer(schemaContext.get()); String serializedValue = iiCodec.serialize(value); writeNamespaceDeclarations(writer,iiCodec.getPrefixes()); 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 5f5e0b23d7..255181341c 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 @@ -205,7 +205,7 @@ final class LeafRefPathParserListenerImpl extends LeafRefPathParserBaseListener{ final Set imports = module.getImports(); for (final ModuleImport moduleImport : imports) { - if(moduleImport.getPrefix().equals(prefix)) { + if (moduleImport.getPrefix().equals(prefix)) { return moduleImport; } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java index bf44fe0f17..7490ecc682 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java @@ -274,7 +274,7 @@ public class LeafRefValidatation { } } } - // FIXME if(node instance of UnkeyedListNode ... + // FIXME if (node instance of UnkeyedListNode ... } private static LeafRefContext findReferencingCtxUnderChoice( diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java index 8f4c5eee91..aec3a9c6db 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java @@ -251,7 +251,7 @@ public class ImmutableNormalizedNodeStreamWriter implements SchemaAwareNormalize @Override public void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint) { - if(!(getCurrent() instanceof NormalizedNodeResultBuilder)) { + if (!(getCurrent() instanceof NormalizedNodeResultBuilder)) { Preconditions.checkArgument(getCurrent() instanceof ImmutableMapNodeBuilder || getCurrent() instanceof ImmutableOrderedMapNodeBuilder); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java index cb109bef51..f27815bac6 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java @@ -78,7 +78,7 @@ abstract class InstanceIdToNodes implements Identifiable abstract boolean isMixin(); public void addModifyOpIfPresent(final Optional> operation, final AttributesBuilder builder) { - if(operation.isPresent()) { + if (operation.isPresent()) { builder.withAttributes(Collections.singletonMap(operation.get().getKey(), modifyOperationToXmlString(operation.get().getValue()))); } } @@ -128,7 +128,7 @@ abstract class InstanceIdToNodes implements Identifiable @Override public NormalizedNode create(final YangInstanceIdentifier instanceId, final Optional> deepestChild, final Optional> operation) { - if(deepestChild.isPresent()) { + if (deepestChild.isPresent()) { Preconditions.checkState(deepestChild instanceof AnyXmlNode); final NormalizedNodeAttrBuilder anyXmlBuilder = Builders.anyXmlBuilder().withNodeIdentifier(getIdentifier()).withValue(((AnyXmlNode) deepestChild).getValue()); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToSimpleNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToSimpleNodes.java index e5d91fb3c8..17b8cff7a1 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToSimpleNodes.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToSimpleNodes.java @@ -39,7 +39,7 @@ abstract class InstanceIdToSimpleNodes extends InstanceI final PathArgument pathArgument = instanceId.getPathArguments().get(0); final NormalizedNodeAttrBuilder> builder = getBuilder(pathArgument); - if(deepestChild.isPresent()) { + if (deepestChild.isPresent()) { builder.withValue(deepestChild.get().getValue()); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java index e92f0dd728..037265f94f 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriter.java @@ -130,7 +130,7 @@ public class SchemaOrderedNormalizedNodeWriter extends NormalizedNodeWriter { write(qNameToNodes.get(schemaNode.getQName()), schemaNode); } } - } else if(parentSchemaNode instanceof ChoiceSchemaNode) { + } else if (parentSchemaNode instanceof ChoiceSchemaNode) { for (ChoiceCaseNode ccNode : ((ChoiceSchemaNode) parentSchemaNode).getCases()) { for (DataSchemaNode dsn : ccNode.getChildNodes()) { if (qNameToNodes.containsKey(dsn.getQName())) { 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 6869b57d61..e4b923c2db 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 @@ -129,7 +129,7 @@ public final class SchemaUtils { for (ChoiceCaseNode choiceCaseNode : schema.getCases()) { schemaForAugment = findAugment(choiceCaseNode, qNames); - if(schemaForAugment.isPresent()) { + if (schemaForAugment.isPresent()) { break; } } @@ -150,7 +150,7 @@ public final class SchemaUtils { } })); - if(qNamesFromAugment.equals(qNames)) { + if (qNamesFromAugment.equals(qNames)) { return Optional.of(augment); } } @@ -209,7 +209,7 @@ public final class SchemaUtils { } for (AugmentationSchema augmentationSchema : ((AugmentationTarget) schema).getAvailableAugmentations()) { - if(augmentationSchema.getDataChildByName(childSchema.getQName()) != null) { + if (augmentationSchema.getDataChildByName(childSchema.getQName()) != null) { return true; } } @@ -292,11 +292,11 @@ public final class SchemaUtils { Set allChildNodes = Sets.newHashSet(); for (DataSchemaNode childSchema : nodeContainer.getChildNodes()) { - if(childSchema instanceof ChoiceSchemaNode) { + if (childSchema instanceof ChoiceSchemaNode) { for (ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) childSchema).getCases()) { allChildNodes.addAll(getChildNodesRecursive(choiceCaseNode)); } - } else if(childSchema instanceof AugmentationSchema || childSchema instanceof ChoiceCaseNode) { + } else if (childSchema instanceof AugmentationSchema || childSchema instanceof ChoiceCaseNode) { allChildNodes.addAll(getChildNodesRecursive((DataNodeContainer) childSchema)); } else { @@ -324,12 +324,12 @@ public final class SchemaUtils { Set realChildNodes = Sets.newHashSet(); - if(targetSchema instanceof DataNodeContainer) { + if (targetSchema instanceof DataNodeContainer) { realChildNodes = getRealSchemasForAugment((DataNodeContainer)targetSchema, augmentSchema); - } else if(targetSchema instanceof ChoiceSchemaNode) { + } else if (targetSchema instanceof ChoiceSchemaNode) { for (DataSchemaNode dataSchemaNode : augmentSchema.getChildNodes()) { for (ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) targetSchema).getCases()) { - if(getChildNodesRecursive(choiceCaseNode).contains(dataSchemaNode.getQName())) { + if (getChildNodesRecursive(choiceCaseNode).contains(dataSchemaNode.getQName())) { realChildNodes.add(choiceCaseNode.getDataChildByName(dataSchemaNode.getQName())); } } @@ -370,7 +370,7 @@ public final class SchemaUtils { currentAugmentChildNodes.add(dataSchemaNode.getQName()); } - if(childToProcess.getPossibleChildNames().equals(currentAugmentChildNodes)){ + if (childToProcess.getPossibleChildNames().equals(currentAugmentChildNodes)){ return true; } } @@ -413,14 +413,14 @@ public final class SchemaUtils { SchemaNode current = Preconditions.checkNotNull(schemaContext); for (final QName qname : path.getPathFromRoot()) { SchemaNode child; - if(current instanceof DataNodeContainer) { + if (current instanceof DataNodeContainer) { child = ((DataNodeContainer) current).getDataChildByName(qname); if (child == null && current instanceof SchemaContext) { child = tryFindGroupings((SchemaContext) current, qname).orNull(); } - if(child == null && current instanceof SchemaContext) { + if (child == null && current instanceof SchemaContext) { child = tryFindNotification((SchemaContext) current, qname) .or(tryFindRpc(((SchemaContext) current), qname)).orNull(); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java index eee1a72ef3..037e406a3d 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java @@ -36,7 +36,7 @@ public class ImmutableChoiceNodeSchemaAwareBuilder extends ImmutableChoiceNodeBu @Override public DataContainerNodeBuilder withChild(final DataContainerChild child) { - if(validator == null) { + if (validator == null) { Optional detectedCaseOpt = SchemaUtils.detectCase(schema, child); DataValidationException.checkLegalChild(detectedCaseOpt.isPresent(), child.getIdentifier(), schema); validator = new DataNodeContainerValidator(detectedCaseOpt.get()); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java index cebe26b0f5..e6a7880c3e 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java @@ -66,7 +66,7 @@ public class ImmutableMapEntryNodeBuilder extends AbstractImmutableDataContainer final PathArgument identifier = childId.getIdentifier(); // Augmentation nodes cannot be keys, and do not have to be present in childrenQNamesToPaths map - if(isAugment(identifier)) { + if (isAugment(identifier)) { continue; } @@ -88,7 +88,7 @@ public class ImmutableMapEntryNodeBuilder extends AbstractImmutableDataContainer @Override public DataContainerNodeAttrBuilder withChild(final DataContainerChild child) { // Augmentation nodes cannot be keys, and do not have to be present in childrenQNamesToPaths map - if(!isAugment(child.getIdentifier())) { + if (!isAugment(child.getIdentifier())) { childrenQNamesToPaths.put(child.getNodeType(), child.getIdentifier()); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java index f2202c87ed..617083f98a 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java @@ -36,7 +36,7 @@ public class DataNodeContainerValidator { this.childNodes = getChildNodes(schema); - if(schema instanceof AugmentationTarget) { + if (schema instanceof AugmentationTarget) { for (AugmentationSchema augmentationSchema : ((AugmentationTarget) schema).getAvailableAugmentations()) { augments.add(SchemaUtils.getNodeIdentifierForAugmentation(augmentationSchema)); } @@ -67,7 +67,7 @@ public class DataNodeContainerValidator { Set allChildNodes = Sets.newHashSet(); for (DataSchemaNode childSchema : nodeContainer.getChildNodes()) { - if(childSchema instanceof ChoiceCaseNode) { + if (childSchema instanceof ChoiceCaseNode) { allChildNodes.addAll(getChildNodes((DataNodeContainer) childSchema)); } else if (!(childSchema instanceof AugmentationSchema)) { allChildNodes.add(childSchema.getQName()); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/DomUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/DomUtils.java index 4c9ecf2f05..75372ed4f6 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/DomUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/DomUtils.java @@ -76,7 +76,7 @@ public final class DomUtils { final List childNodesCollection = Lists.newArrayList(); final NodeList childNodes = node.getChildNodes(); for (int i = 0; i < childNodes.getLength(); i++) { - if(childNodes.item(i) instanceof Element) { + if (childNodes.item(i) instanceof Element) { childNodesCollection.add((Element) childNodes.item(i)); } } @@ -107,7 +107,7 @@ public final class DomUtils { } // Skip namespace definitions - if(namespace.equals(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)) { + if (namespace.equals(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)) { continue; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AugmentationModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AugmentationModificationStrategy.java index 91fd2e557c..211473f92b 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AugmentationModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AugmentationModificationStrategy.java @@ -42,7 +42,7 @@ final class AugmentationModificationStrategy extends AbstractDataNodeContainerMo private static AugmentationSchema createAugmentProxy(final AugmentationSchema schema, final DataNodeContainer resolved) { final Set realChildSchemas = new HashSet<>(); - for(final DataSchemaNode augChild : schema.getChildNodes()) { + for (final DataSchemaNode augChild : schema.getChildNodes()) { realChildSchemas.add(resolved.getDataChildByName(augChild.getQName())); } return new EffectiveAugmentationSchema(schema, realChildSchemas); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java index 62c6ebcad9..aa65d3188c 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java @@ -81,7 +81,7 @@ final class ChoiceModificationStrategy extends AbstractNodeContainerModification @Override void verifyStructure(final NormalizedNode writtenValue, final boolean verifyChildren) { - if(verifyChildrenStructure() && verifyChildren) { + if (verifyChildrenStructure() && verifyChildren) { enforceCases(writtenValue); } super.verifyStructure(writtenValue, verifyChildren); 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 cd361ce328..68ac57a150 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 @@ -151,7 +151,7 @@ final class InMemoryDataTreeModification extends AbstractCursorAware implements ModifiedNode modification = rootNode; int i = 1; - for(final PathArgument pathArg : path.getPathArguments()) { + for (final PathArgument pathArg : path.getPathArguments()) { final Optional potential = operation.getChild(pathArg); if (!potential.isPresent()) { throw new SchemaValidationFailedException(String.format("Child %s is not present in schema tree.", 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 2ca70603d4..29fa6070fa 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 @@ -93,7 +93,7 @@ abstract class SchemaAwareApplyOperation extends ModificationApplyOperation { private static SchemaAwareApplyOperation fromLeafListSchemaNode(final LeafListSchemaNode schemaNode, final TreeType treeType) { final SchemaAwareApplyOperation op; - if(schemaNode.isUserOrdered()) { + if (schemaNode.isUserOrdered()) { op = new OrderedLeafSetModificationStrategy(schemaNode, treeType); } else { op = new UnorderedLeafSetModificationStrategy(schemaNode, treeType); @@ -146,7 +146,7 @@ abstract class SchemaAwareApplyOperation extends ModificationApplyOperation { * it should not cause transaction to fail, since result of this merge * leads to same data. */ - if(!original.get().getData().equals(current.get().getData())) { + if (!original.get().getData().equals(current.get().getData())) { checkNotConflicting(path, original.get(), current.get()); } } @@ -167,7 +167,7 @@ abstract class SchemaAwareApplyOperation extends ModificationApplyOperation { final Optional original = modification.getOriginal(); if (original.isPresent() && current.isPresent()) { checkNotConflicting(path, original.get(), current.get()); - } else if(original.isPresent()) { + } else if (original.isPresent()) { throw new ConflictingModificationAppliedException(path,"Node was deleted by other transaction."); } else if (current.isPresent()) { throw new ConflictingModificationAppliedException(path, "Node was created by other transaction."); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/TypeDefinitionAwareCodecTestHelper.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/TypeDefinitionAwareCodecTestHelper.java index 61562ce778..8c759e8074 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/TypeDefinitionAwareCodecTestHelper.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/TypeDefinitionAwareCodecTestHelper.java @@ -51,7 +51,7 @@ public class TypeDefinitionAwareCodecTestHelper { public static EnumTypeDefinition toEnumTypeDefinition( String... enums ) { List enumList = Lists.newArrayList(); - for( String en: enums ) { + for (String en: enums ) { EnumTypeDefinition.EnumPair mockEnum = mock( EnumTypeDefinition.EnumPair.class ); when( mockEnum.getName() ).thenReturn( en ); enumList.add( mockEnum ); @@ -67,7 +67,7 @@ public class TypeDefinitionAwareCodecTestHelper { public static BitsTypeDefinition toBitsTypeDefinition( String... bits ) { List bitList = Lists.newArrayList(); - for( String bit: bits ) { + for (String bit: bits ) { BitsTypeDefinition.Bit mockBit = mock( BitsTypeDefinition.Bit.class ); when( mockBit.getName() ).thenReturn( bit ); bitList.add( mockBit ); diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java index c509dab1ce..9c999da6d2 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java @@ -399,7 +399,7 @@ public class Bug4454Test { UnmodifiableCollection collectionChildren = (UnmodifiableCollection) minMaxListRead.get().getValue(); for (Object collectionChild : collectionChildren) { - if(collectionChild.toString().contains(first)){ + if (collectionChild.toString().contains(first)){ assertTrue(collectionChild.toString().contains(first)); } else { assertTrue(collectionChild.toString().contains(second)); diff --git a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/TestUtils.java b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/TestUtils.java index 9a5ff3ba71..15987f2d45 100644 --- a/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/TestUtils.java +++ b/yang/yang-data-jaxen/src/test/java/org/opendaylight/yangtools/yang/data/jaxen/TestUtils.java @@ -87,7 +87,7 @@ final class TestUtils { StatementStreamSource[] sources = new StatementStreamSource[files.length]; - for(int i = 0; i ret = new ArrayList<>(); final ContainerSchemaNode input = getInput(); final ContainerSchemaNode output = getOutput(); - if(input != null) { + if (input != null) { ret.add(input); } - if(output != null) { + if (output != null) { ret.add(output); } return ret; diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/XpathStringParsingPathArgumentBuilder.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/XpathStringParsingPathArgumentBuilder.java index 133df37c1c..980f5f7c67 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/XpathStringParsingPathArgumentBuilder.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/XpathStringParsingPathArgumentBuilder.java @@ -97,7 +97,7 @@ class XpathStringParsingPathArgumentBuilder implements Builder nextContextNode(QName name) { current = current.getChild(name); checkValid(current != null, "%s is not correct schema node identifier.",name); - while(current.isMixin()) { + while (current.isMixin()) { product.add(current.getIdentifier()); current = current.getChild(name); } @@ -138,11 +138,11 @@ class XpathStringParsingPathArgumentBuilder implements Builder keyValues = ImmutableMap.builder(); - while(!allCharactersConsumed() && PRECONDITION_START == currentChar()) { + while (!allCharactersConsumed() && PRECONDITION_START == currentChar()) { skipCurrentChar(); skipWhitespaces(); final QName key; - if(DOT == currentChar()) { + if (DOT == currentChar()) { key = null; skipCurrentChar(); } else { @@ -156,7 +156,7 @@ class XpathStringParsingPathArgumentBuilder implements Builder mapFrom(final Collection definitions) { final HashMap ret = new HashMap<>(definitions.size()); - for(final ExtensionDefinition def : definitions) { + for (final ExtensionDefinition def : definitions) { final StatementDefinition value = from(def); ret.put(value.getStatementName(), value); } diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java index 542463cd77..144c750c7a 100644 --- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java +++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaContextEmitter.java @@ -692,7 +692,7 @@ class SchemaContextEmitter { } private void emitMust(@Nullable final MustDefinition mustCondition) { - if(mustCondition != null && mustCondition.getXpath() != null) { + if (mustCondition != null && mustCondition.getXpath() != null) { writer.startMustNode(mustCondition.getXpath()); emitErrorMessageNode(mustCondition.getErrorMessage()); emitErrorAppTagNode(mustCondition.getErrorAppTag()); @@ -1073,7 +1073,7 @@ class SchemaContextEmitter { emitStatusNode(augmentation.getStatus()); emitDescriptionNode(augmentation.getDescription()); emitReferenceNode(augmentation.getReference()); - for(final UsesNode uses: augmentation.getUses()) { + for (final UsesNode uses: augmentation.getUses()) { emitUsesNode(uses); } @@ -1114,7 +1114,7 @@ class SchemaContextEmitter { } private void emitWhen(final RevisionAwareXPath revisionAwareXPath) { - if(revisionAwareXPath != null) { + if (revisionAwareXPath != null) { writer.startWhenNode(revisionAwareXPath); writer.endNode(); } @@ -1131,10 +1131,10 @@ class SchemaContextEmitter { emitDescriptionNode(rpc.getDescription()); emitReferenceNode(rpc.getReference()); - for(final TypeDefinition typedef : rpc.getTypeDefinitions()) { + for (final TypeDefinition typedef : rpc.getTypeDefinitions()) { emitTypedefNode(typedef); } - for(final GroupingDefinition grouping : rpc.getGroupings()) { + for (final GroupingDefinition grouping : rpc.getGroupings()) { emitGrouping(grouping); } emitInput(rpc.getInput()); @@ -1179,11 +1179,11 @@ class SchemaContextEmitter { private static boolean isPrefix(final Iterable prefix, final Iterable other) { final Iterator prefixIt = prefix.iterator(); final Iterator otherIt = other.iterator(); - while(prefixIt.hasNext()) { - if(!otherIt.hasNext()) { + while (prefixIt.hasNext()) { + if (!otherIt.hasNext()) { return false; } - if(!Objects.deepEquals(prefixIt.next(), otherIt.next())) { + if (!Objects.deepEquals(prefixIt.next(), otherIt.next())) { return false; } } diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java index d8adf1c89d..0baf827c08 100644 --- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java +++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java @@ -106,13 +106,13 @@ class SingleModuleYinStatementWriter implements StatementTextWriter { public void writeArgument(final SchemaPath targetPath) { checkArgumentApplicable(); final StringBuilder valueStr = new StringBuilder(); - if(targetPath.isAbsolute()) { + if (targetPath.isAbsolute()) { valueStr.append("/"); } final Iterator argIt = targetPath.getPathFromRoot().iterator(); - while(argIt.hasNext()) { + while (argIt.hasNext()) { valueStr.append(toPrefixedString(argIt.next())); - if(argIt.hasNext()) { + if (argIt.hasNext()) { valueStr.append("/"); } } @@ -175,7 +175,7 @@ class SingleModuleYinStatementWriter implements StatementTextWriter { } private @Nullable String ensureAndGetXmlNamespacePrefix(final URI namespace) { - if(YangConstants.RFC6020_YANG_NAMESPACE.equals(namespace)) { + if (YangConstants.RFC6020_YANG_NAMESPACE.equals(namespace)) { // YANG namespace does not have prefix if used in arguments. return null; @@ -185,7 +185,7 @@ class SingleModuleYinStatementWriter implements StatementTextWriter { // FIXME: declare prefix prefix =prefixToNamespace.inverse().get(namespace); } - if(prefix == null) { + if (prefix == null) { throw new IllegalArgumentException("Namespace " + namespace + " is not bound to imported prefixes."); } return prefix; diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java index e8461d559e..dcc63639ce 100644 --- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java +++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java @@ -86,7 +86,7 @@ public final class YinExportUtils { private static Map prefixToNamespace(final SchemaContext ctx, final Module module) { final BiMap prefixMap = HashBiMap.create(module.getImports().size() + 1); prefixMap.put(module.getPrefix(), module.getNamespace()); - for(final ModuleImport imp : module.getImports()) { + for (final ModuleImport imp : module.getImports()) { final String prefix = imp.getPrefix(); final URI namespace = getModuleNamespace(ctx,imp.getModuleName()); prefixMap.put(prefix, namespace); @@ -95,8 +95,8 @@ public final class YinExportUtils { } private static URI getModuleNamespace(final SchemaContext ctx, final String moduleName) { - for(final Module module : ctx.getModules()) { - if(moduleName.equals(module.getName())) { + for (final Module module : ctx.getModules()) { + if (moduleName.equals(module.getName())) { return module.getNamespace(); } } 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 0234cc7759..6a4b83a5eb 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 @@ -73,7 +73,7 @@ public final class FilesystemSchemaSourceCache representation) { for (final Class supportedRepresentation : STORAGE_ADAPTERS.keySet()) { - if(supportedRepresentation.isAssignableFrom(representation)) { + if (supportedRepresentation.isAssignableFrom(representation)) { return; } } @@ -116,7 +116,7 @@ public final class FilesystemSchemaSourceCache getSource(final SourceIdentifier sourceIdentifier) { final File file = sourceIdToFile(sourceIdentifier, storageDirectory); - if(file.exists() && file.canRead()) { + if (file.exists() && file.canRead()) { LOG.trace("Source {} found in cache as {}", sourceIdentifier, file); final SchemaSourceRepresentation restored = STORAGE_ADAPTERS.get(representation).restore(sourceIdentifier, file); return Futures.immediateCheckedFuture(representation.cast(restored)); @@ -130,7 +130,7 @@ public final class FilesystemSchemaSourceCache si = getSourceIdentifier(fileName); - if(si.isPresent()) { + if (si.isPresent()) { LOG.trace("Restoring cached file {} as {}", file, si.get()); cachedSchemas.add(si.get()); } else { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DerivedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DerivedType.java index 74ff865d17..f2d277d3cc 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DerivedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/DerivedType.java @@ -50,7 +50,7 @@ public abstract class DerivedType> implements TypeDe } public static TypeDefinition from(final TypeDefinition type) { - if(type instanceof ExtendedType) { + if (type instanceof ExtendedType) { return from((ExtendedType) type); } return type; @@ -88,13 +88,13 @@ public abstract class DerivedType> implements TypeDe if (baseType instanceof StringTypeDefinition) { return new DerivedStringType(type); } - if(baseType instanceof UnionTypeDefinition) { + if (baseType instanceof UnionTypeDefinition) { return new DerivedUnionType(type); } - if(baseType instanceof EnumTypeDefinition) { + if (baseType instanceof EnumTypeDefinition) { return new DerivedEnumType(type); } - if(baseType instanceof BitsTypeDefinition) { + if (baseType instanceof BitsTypeDefinition) { return new DerivedBitsType(type); } throw new IllegalArgumentException("Not supported base type of " + baseType.getClass()); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java index 1ea460e695..8cf162b26c 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EnumerationType.java @@ -39,7 +39,7 @@ public final class EnumerationType implements EnumTypeDefinition { private EnumerationType(final SchemaPath path, final List enums, final Optional defaultEnum) { this.path = Preconditions.checkNotNull(path,"path must not be null"); this.enums = ImmutableList.copyOf(Preconditions.checkNotNull(enums, "enums must not be null.")); - if(defaultEnum.isPresent()) { + if (defaultEnum.isPresent()) { Preconditions.checkArgument(enums.contains(defaultEnum.get()),"defaultEnum must be contained in defined enumerations."); this.defaultEnum = defaultEnum.get(); } else { 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 728f52d458..2a5dd589f7 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 @@ -193,16 +193,16 @@ public final class FilteringSchemaContextProxy extends AbstractSchemaContext { for (ModuleId rootModule : rootModules) { - if(rootModule.equals(new ModuleId(module.getName(), module.getRevision()))) { + if (rootModule.equals(new ModuleId(module.getName(), module.getRevision()))) { return true; } //handling/checking imports regarding root modules for (ModuleImport moduleImport : module.getImports()) { - if(moduleImport.getModuleName().equals(rootModule.getName())) { + if (moduleImport.getModuleName().equals(rootModule.getName())) { - if(moduleImport.getRevision() != null && !moduleImport.getRevision().equals(rootModule.getRev())) { + if (moduleImport.getRevision() != null && !moduleImport.getRevision().equals(rootModule.getRev())) { return false; } 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 b10633a2ea..7f494b14b5 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 @@ -655,13 +655,13 @@ public final class SchemaContextUtil { // FIXME this is just to preserve backwards compatibility since yangtools do not mind wrong leafref xpaths // and current expected behaviour for such cases is to just use pure string // This should throw an exception about incorrect XPath in leafref - if(dataSchemaNode == null) { + if (dataSchemaNode == null) { return null; } final TypeDefinition targetTypeDefinition = typeDefinition(dataSchemaNode); - if(targetTypeDefinition instanceof LeafrefTypeDefinition) { + if (targetTypeDefinition instanceof LeafrefTypeDefinition) { return getBaseTypeForLeafRef(((LeafrefTypeDefinition) targetTypeDefinition), schemaContext, dataSchemaNode); } else { return targetTypeDefinition; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java index f572247740..5121da0ec7 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java @@ -24,7 +24,7 @@ public class SchemaNodeUtils { } public static Optional getOriginalIfPossible(final SchemaNode node) { - if(node instanceof DerivableSchemaNode) { + if (node instanceof DerivableSchemaNode) { @SuppressWarnings("unchecked") final Optional ret = (Optional) (((DerivableSchemaNode) node).getOriginal()); return ret; @@ -35,7 +35,7 @@ public class SchemaNodeUtils { public static SchemaNode getRootOriginalIfPossible(final SchemaNode data) { Optional previous = Optional.absent(); Optional next = getOriginalIfPossible(data); - while(next.isPresent()) { + while (next.isPresent()) { previous = next; next = getOriginalIfPossible(next.get()); } diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java index 5fd9c37364..c4f7f1acb4 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java @@ -418,7 +418,7 @@ public class SchemaContextProxyTest { Set modSet = Sets.newHashSet(); - if(expected!=null) { + if (expected!=null) { modSet = Sets.newHashSet(expected); } @@ -428,7 +428,7 @@ public class SchemaContextProxyTest { assertEquals(modSet, modSetFiltering); //asserting collections - if(expected!=null) { + if (expected!=null) { for (final Module module : expected) { assertEquals(module, filteringSchemaContextProxy.findModuleByName(module.getName(), module.getRevision())); @@ -447,7 +447,7 @@ public class SchemaContextProxyTest { Set modulesSet = new HashSet<>(); - if(modules!=null) { + if (modules!=null) { modulesSet = Sets.newHashSet(modules); @@ -460,7 +460,7 @@ public class SchemaContextProxyTest { Set moduleIds = Sets.newHashSet(); - if(modules!=null && modules.size()>0) { + if (modules!=null && modules.size()>0) { for (Module module : modules) { 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 e7808dc37d..fef3cf84da 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 @@ -174,7 +174,7 @@ public class ModuleBuilder extends AbstractDocumentedDataNodeContainerBuilder im */ @Override public Module build() { - if(instance != null) { + if (instance != null) { return instance; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java index d9d0c41384..b3a0aa7623 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/RefineUtils.java @@ -263,7 +263,7 @@ public final class RefineUtils { final DocumentedNodeBuilder documentedNode; - if(node instanceof DocumentedNodeBuilder) { + if (node instanceof DocumentedNodeBuilder) { documentedNode = ((DocumentedNodeBuilder) node); } else { documentedNode = null; @@ -273,7 +273,7 @@ public final class RefineUtils { if (description != null) { - if(documentedNode != null) { + if (documentedNode != null) { documentedNode.setDescription(description); } else { throw new YangParseException(moduleName, line, String.format("Cannot refine description in of target %s",refine.getTargetPathString())); @@ -283,7 +283,7 @@ public final class RefineUtils { String reference = refine.getReference(); if (reference != null) { - if(documentedNode != null) { + if (documentedNode != null) { documentedNode.setReference(reference); } else { throw new YangParseException(moduleName, line, String.format("Cannot refine reference in of target %s",refine.getTargetPathString())); @@ -292,7 +292,7 @@ public final class RefineUtils { Boolean config = refine.isConfiguration(); if (config != null) { - if(node instanceof DataSchemaNodeBuilder) { + if (node instanceof DataSchemaNodeBuilder) { ((DataSchemaNodeBuilder) node).setConfiguration(config); } else { throw new YangParseException(moduleName, line, String.format("Cannot refine config of target %s ",refine.getTargetPathString())); 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 2cdf33ae26..2311abf1d2 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 @@ -389,7 +389,7 @@ public final class ParserListenerUtils { final String str = stringNode.getText(); char firstChar = str.charAt(0); final CharMatcher quoteMatcher; - if(SINGLE_QUOTE_MATCHER.matches(firstChar)) { + if (SINGLE_QUOTE_MATCHER.matches(firstChar)) { quoteMatcher = SINGLE_QUOTE_MATCHER; } else if (DOUBLE_QUOTE_MATCHER.matches(firstChar)) { quoteMatcher = DOUBLE_QUOTE_MATCHER; @@ -1981,7 +1981,7 @@ public final class ParserListenerUtils { public static Optional getFirstContext(final ParserRuleContext context,final Class contextType) { List potential = context.getRuleContexts(contextType); - if(potential.isEmpty()) { + if (potential.isEmpty()) { return Optional.absent(); } return Optional.of(potential.get(0)); 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 affa642e43..f2180a3b2e 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 @@ -96,7 +96,7 @@ final class DependencyResolver { final Set dependencies = dep.getDependencies(); // in case of submodule, remember belongs to - if(dep instanceof YangModelDependencyInfo.SubmoduleDependencyInfo) { + if (dep instanceof YangModelDependencyInfo.SubmoduleDependencyInfo) { final String parent = ((YangModelDependencyInfo.SubmoduleDependencyInfo) dep).getParentModule(); submodules.put(id, new BelongsToDependency(parent)); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java index 53c12ccd57..81984076fe 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceBehaviour.java @@ -247,7 +247,7 @@ public abstract class NamespaceBehaviour currentSource = sourcesToProgress.iterator(); - while(currentSource.hasNext()) { + while (currentSource.hasNext()) { SourceSpecificContext nextSourceCtx = currentSource.next(); PhaseCompletionProgress sourceProgress = nextSourceCtx.tryToCompletePhase(currentPhase); switch (sourceProgress) { 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 2966245673..25fe2ec911 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 @@ -66,8 +66,8 @@ class ModifierImpl implements ModelActionBuilder { private boolean removeSatisfied() { Iterator> prereq = unsatisfied.iterator(); boolean allSatisfied = true; - while(prereq.hasNext()) { - if(prereq.next().isDone()) { + while (prereq.hasNext()) { + if (prereq.next().isDone()) { // We are removing current prerequisite from list. prereq.remove(); } else { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java index b62401b78d..5f77fd4aaf 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java @@ -67,7 +67,7 @@ abstract class NamespaceBehaviourWithListeners listener : toNotify) { + for (ValueAddedListener listener : toNotify) { listener.trigger(value); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java index 63db5d1c70..e578e912ab 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceStorageSupport.java @@ -68,11 +68,11 @@ abstract class NamespaceStorageSupport implements NamespaceStorageNode { Map localNamespace = (Map) namespaces.get(type); V potential = null; - if(localNamespace != null) { + if (localNamespace != null) { potential = localNamespace.get(key); } - if(potential == null && Utils.isModuleIdentifierWithoutSpecifiedRevision(key)) { + if (potential == null && Utils.isModuleIdentifierWithoutSpecifiedRevision(key)) { potential = getRegardlessOfRevision((ModuleIdentifier)key,(Map)localNamespace); } @@ -108,7 +108,7 @@ abstract class NamespaceStorageSupport implements NamespaceStorageNode { public > void addToLocalStorage(final Class type, final K key, final V value) { @SuppressWarnings("unchecked") Map localNamespace = (Map) namespaces.get(type); - if(localNamespace == null) { + if (localNamespace == null) { checkLocalNamespaceAllowed(type); localNamespace = new HashMap<>(); namespaces.put(type, localNamespace); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java index 7520c8ff73..b24f6e3e04 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java @@ -145,7 +145,7 @@ public class RootStatementContext, E extends E copy.addAllToCopyHistory(this.getCopyHistory()); copy.addToCopyHistory(typeOfCopy); - if(this.getOriginalCtx() != null) { + if (this.getOriginalCtx() != null) { copy.setOriginalCtx(this.getOriginalCtx()); } else { copy.setOriginalCtx(this); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java index ef26cda073..ead4acb8aa 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SourceSpecificContext.java @@ -353,7 +353,7 @@ public class SourceSpecificContext implements NamespaceStorageNode, NamespaceBeh private PrefixToModule preLinkagePrefixes() { PrefixToModuleMap preLinkagePrefixes = new PrefixToModuleMap(true); Map prefixToNamespaceMap = getAllFromLocalStorage(ImpPrefixToNamespace.class); - if(prefixToNamespaceMap == null) { + if (prefixToNamespaceMap == null) { //:FIXME if it is a submodule without any import, the map is null. Handle also submodules and includes... return null; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java index 3f8684e7db..f6499e1e6a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java @@ -41,7 +41,7 @@ class StatementContextWriter implements StatementWriter { } void defferedCreate() throws SourceException { - if(current != null) { + if (current != null) { parent = current.build(); current = null; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java index 8a6d80a856..c7e1c1a8de 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java @@ -142,7 +142,7 @@ final class SubstatementContext, E extends Eff copy.addAllToCopyHistory(this.getCopyHistory()); copy.addToCopyHistory(typeOfCopy); - if(this.getOriginalCtx() != null) { + if (this.getOriginalCtx() != null) { copy.setOriginalCtx(this.getOriginalCtx()); } else { copy.setOriginalCtx(this); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java index 0c9fa1d9f4..c171a7a1f3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java @@ -118,7 +118,7 @@ public final class AugmentUtils { * If the statement argument is not QName, it cannot be mandatory statement, * therefore return false and skip mandatory nodes validation */ - if(!(sourceCtx.getStatementArgument() instanceof QName)) { + if (!(sourceCtx.getStatementArgument() instanceof QName)) { return false; } QName sourceStmtQName = (QName) sourceCtx.getStatementArgument(); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChildSchemaNodes.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChildSchemaNodes.java index 940e7c74eb..cf5450afad 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChildSchemaNodes.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ChildSchemaNodes.java @@ -54,7 +54,7 @@ public class ChildSchemaNodes,E extends Effec private static NamespaceStorageNode globalOrStatementSpecific(final NamespaceBehaviour.NamespaceStorageNode storage) { NamespaceStorageNode current = storage; - while(current.getStorageNodeType() != StorageNodeType.STATEMENT_LOCAL && current.getStorageNodeType() != StorageNodeType.GLOBAL) { + while (current.getStorageNodeType() != StorageNodeType.STATEMENT_LOCAL && current.getStorageNodeType() != StorageNodeType.GLOBAL) { current = current.getParentNamespaceStorage(); } return current; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java index 67297ebb10..40d84cee4c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java @@ -41,14 +41,14 @@ class SchemaNodeIdentifierBuildNamespace extends public StmtContext.Mutable> getFrom(NamespaceStorageNode storage, SchemaNodeIdentifier key) { final NamespaceStorageNode lookupStartStorage; - if(key.isAbsolute() || storage.getStorageNodeType() == StorageNodeType.ROOT_STATEMENT_LOCAL) { + if (key.isAbsolute() || storage.getStorageNodeType() == StorageNodeType.ROOT_STATEMENT_LOCAL) { lookupStartStorage = NamespaceBehaviour.findClosestTowardsRoot(storage, StorageNodeType.GLOBAL); } else { lookupStartStorage = storage; } Iterator iterator = key.getPathFromRoot().iterator(); - if(!iterator.hasNext()) { - if(lookupStartStorage instanceof StmtContext) { + if (!iterator.hasNext()) { + if (lookupStartStorage instanceof StmtContext) { return (StmtContext.Mutable>) lookupStartStorage; } else { return null; @@ -57,7 +57,7 @@ class SchemaNodeIdentifierBuildNamespace extends QName nextPath = iterator.next(); StmtContext.Mutable> current = (StmtContext.Mutable>) lookupStartStorage .getFromLocalStorage(ChildSchemaNodes.class, nextPath); - if(current == null && lookupStartStorage instanceof StmtContext) { + if (current == null && lookupStartStorage instanceof StmtContext) { return tryToFindUnknownStatement(nextPath.getLocalName(), (Mutable>) lookupStartStorage); } while (current != null && iterator.hasNext()) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java index 3080e48b5e..fb32202647 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangStatementSourceImpl.java @@ -124,7 +124,7 @@ public final class YangStatementSourceImpl implements StatementStreamSource { final YangErrorListener errorListener = new YangErrorListener(); parser.addErrorListener(errorListener); - if(stream instanceof NamedFileInputStream) { + if (stream instanceof NamedFileInputStream) { sourceName = stream.toString(); } else { sourceName = null; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveStatementBase.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveStatementBase.java index 15888ae590..7b35dad07c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveStatementBase.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveStatementBase.java @@ -78,7 +78,7 @@ public abstract class EffectiveStatementBase> final Collection> effectiveSubstatements = ctx.effectiveSubstatements(); final Collection> substatementsInit = new ArrayList<>(); - for(StatementContextBase declaredSubstatement : ctx.declaredSubstatements()) { + for (StatementContextBase declaredSubstatement : ctx.declaredSubstatements()) { if (declaredSubstatement.getPublicDefinition().equals(Rfc6020Mapping.USES)) { substatementsInit.add(declaredSubstatement); substatementsInit.addAll(declaredSubstatement.getEffectOfStatement()); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java index 00bf6c10ca..da4a2a92ec 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ExtensionEffectiveStatementImpl.java @@ -80,7 +80,7 @@ public class ExtensionEffectiveStatementImpl extends AbstractEffectiveDocumented @Override public List getUnknownSchemaNodes() { - if(unknownNodes == null) { + if (unknownNodes == null) { initUnknownSchemaNodes(); } return unknownNodes; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleOrModuleBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleOrModuleBuilder.java index 7e3fcbede7..3083dad802 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleOrModuleBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ModuleOrModuleBuilder.java @@ -48,7 +48,7 @@ class ModuleOrModuleBuilder { static List fromAll(final Collection modules, final Collection moduleBuilders) { List result = new ArrayList<>(modules.size() + moduleBuilders.size()); - for(Module m: modules){ + for (Module m: modules){ result.add(new ModuleOrModuleBuilder(m)); } for (ModuleBuilder mb : moduleBuilders) { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java index d88d36eade..15ba925673 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java @@ -615,8 +615,8 @@ public class UsesAugmentTest { Set> types = testModule.getTypeDefinitions(); TypeDefinition intExt = null; - for(TypeDefinition td : types) { - if("int-ext".equals(td.getQName().getLocalName())) { + for (TypeDefinition td : types) { + if ("int-ext".equals(td.getQName().getLocalName())) { intExt = td; } } @@ -629,10 +629,10 @@ public class UsesAugmentTest { TypeDefinition uint8 = null; TypeDefinition pv = null; - for(TypeDefinition td : union.getTypes()) { - if("uint8".equals(td.getQName().getLocalName())) { + for (TypeDefinition td : union.getTypes()) { + if ("uint8".equals(td.getQName().getLocalName())) { uint8 = td; - } else if("protocol-version".equals(td.getQName().getLocalName())) { + } else if ("protocol-version".equals(td.getQName().getLocalName())) { pv = td; } } -- 2.36.6