Another round of checkstyle fixes

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / repo / SharedSchemaContextFactory.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java
index 0288d7afec7ca1dbaae98c0c30087e6391f1396b..ce9ed357762ef57ca0b8e83aade54f6e3a2f0bc2 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java
@@ -65,7 +65,7 @@ final class SharedSchemaContextFactory implements SchemaContextFactory {
 
     // FIXME SchemaRepository should be the type for repository parameter instead of SharedSchemaRepository
     //       (final implementation)
-    public SharedSchemaContextFactory(final SharedSchemaRepository repository, final SchemaSourceFilter filter) {
+    SharedSchemaContextFactory(final SharedSchemaRepository repository, final SchemaSourceFilter filter) {
         this.repository = Preconditions.checkNotNull(repository);
         this.filter = Preconditions.checkNotNull(filter);
     }
@@ -79,10 +79,6 @@ final class SharedSchemaContextFactory implements SchemaContextFactory {
                 new AssembleSources(Optional.ofNullable(supportedFeatures), statementParserMode));
     }
 
-    private ListenableFuture<ASTSchemaSource> requestSource(final SourceIdentifier identifier) {
-        return repository.getSchemaSource(identifier, ASTSchemaSource.class);
-    }
-
     private CheckedFuture<SchemaContext, SchemaResolutionException> createSchemaContext(
             final Collection<SourceIdentifier> requiredSources,
             final Cache<Collection<SourceIdentifier>, SchemaContext> cache,
@@ -118,15 +114,21 @@ final class SharedSchemaContextFactory implements SchemaContextFactory {
             }
 
             @Override
-            public void onFailure(@Nonnull final Throwable t) {
-                LOG.debug("Failed to assemble sources", t);
+            public void onFailure(@Nonnull final Throwable cause) {
+                LOG.debug("Failed to assemble sources", cause);
             }
         }, MoreExecutors.directExecutor());
 
         return Futures.makeChecked(cf, MAPPER);
     }
 
+    private ListenableFuture<ASTSchemaSource> requestSource(final SourceIdentifier identifier) {
+        return repository.getSchemaSource(identifier, ASTSchemaSource.class);
+    }
+
     /**
+     * Return a set of de-duplicated inputs.
+     *
      * @return set (preserving ordering) from the input collection
      */
     private static List<SourceIdentifier> deDuplicateSources(final Collection<SourceIdentifier> requiredSources) {
@@ -145,7 +147,7 @@ final class SharedSchemaContextFactory implements SchemaContextFactory {
             List<ASTSchemaSource>> {
         private final List<SourceIdentifier> sourceIdentifiers;
 
-        public SourceIdMismatchDetector(final List<SourceIdentifier> sourceIdentifiers) {
+        SourceIdMismatchDetector(final List<SourceIdentifier> sourceIdentifiers) {
             this.sourceIdentifiers = Preconditions.checkNotNull(sourceIdentifiers);
         }
 
@@ -186,11 +188,11 @@ final class SharedSchemaContextFactory implements SchemaContextFactory {
             this.supportedFeatures = supportedFeatures;
             this.statementParserMode = Preconditions.checkNotNull(statementParserMode);
             switch (statementParserMode) {
-            case SEMVER_MODE:
-                this.getIdentifier = ASTSchemaSource::getSemVerIdentifier;
-                break;
-            default:
-                this.getIdentifier = ASTSchemaSource::getIdentifier;
+                case SEMVER_MODE:
+                    this.getIdentifier = ASTSchemaSource::getSemVerIdentifier;
+                    break;
+                default:
+                    this.getIdentifier = ASTSchemaSource::getIdentifier;
             }
         }