diff options
Diffstat (limited to 'infra')
19 files changed, 77 insertions, 41 deletions
diff --git a/infra/data-impl/src/test/java/io/fd/honeycomb/data/impl/PersistingDataTreeAdapterTest.java b/infra/data-impl/src/test/java/io/fd/honeycomb/data/impl/PersistingDataTreeAdapterTest.java index 487b84d22..44baed10d 100644 --- a/infra/data-impl/src/test/java/io/fd/honeycomb/data/impl/PersistingDataTreeAdapterTest.java +++ b/infra/data-impl/src/test/java/io/fd/honeycomb/data/impl/PersistingDataTreeAdapterTest.java @@ -122,7 +122,7 @@ public class PersistingDataTreeAdapterTest { @Test(expected = IllegalStateException.class) public void testPersistFailure() throws Exception { - doThrow(IOException.class).when(schemaService).getGlobalContext(); + doThrow(IllegalStateException.class).when(schemaService).getGlobalContext(); final PersistingDataTreeAdapter.JsonPersister jsonPersister = new PersistingDataTreeAdapter.JsonPersister(tmpPersistFile, schemaService); // Nothing diff --git a/infra/it/it-test/pom.xml b/infra/it/it-test/pom.xml index f8ebf56b2..427eaa737 100644 --- a/infra/it/it-test/pom.xml +++ b/infra/it/it-test/pom.xml @@ -91,6 +91,11 @@ <artifactId>mdsal-netconf-connector</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/infra/it/memory-benchmark-scripts/pom.xml b/infra/it/memory-benchmark-scripts/pom.xml index 8585c910a..0502e4958 100644 --- a/infra/it/memory-benchmark-scripts/pom.xml +++ b/infra/it/memory-benchmark-scripts/pom.xml @@ -7,10 +7,10 @@ <properties> <!-- groovy --> - <maven.groovy.version>2.0</maven.groovy.version> - <groovy.version>2.4.7</groovy.version> - <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version> - <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version> + <maven.groovy.version>1.6.2</maven.groovy.version> + <groovy.version>2.5.5</groovy.version> + <groovy.eclipse.compiler.version>3.3.0-01</groovy.eclipse.compiler.version> + <groovy.eclipse.batch.version>2.5.6-02</groovy.eclipse.batch.version> </properties> <modelVersion>4.0.0</modelVersion> @@ -42,9 +42,12 @@ </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.0</version> <!-- 2.8.0-01 and later require maven-compiler-plugin 3.1 or higher --> <configuration> <compilerId>groovy-eclipse-compiler</compilerId> + <source>1.8</source> + <target>1.8</target> </configuration> <dependencies> <dependency> @@ -53,6 +56,7 @@ <version>${groovy.eclipse.compiler.version}</version> </dependency> <!-- for 2.8.0-01 and later you must have an explicit dependency on groovy-eclipse-batch --> + <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-eclipse-batch --> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-eclipse-batch</artifactId> @@ -68,6 +72,7 @@ <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> <version>${groovy.version}</version> + <type>pom</type> </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/infra/it/memory-benchmark/pom.xml b/infra/it/memory-benchmark/pom.xml index 34f8668f2..2139bc246 100644 --- a/infra/it/memory-benchmark/pom.xml +++ b/infra/it/memory-benchmark/pom.xml @@ -33,12 +33,12 @@ <!-- Static version, we don't want it to be deployed anyway--> <version>1.0.0</version> <properties> - <commons-csv.version>1.4</commons-csv.version> + <commons-csv.version>1.6</commons-csv.version> <honeycomb.version>1.19.04-SNAPSHOT</honeycomb.version> - <maven.groovy.version>2.0</maven.groovy.version> - <groovy.version>2.4.7</groovy.version> - <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version> - <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version> + <maven.groovy.version>1.6.2</maven.groovy.version> + <groovy.version>2.5.5</groovy.version> + <groovy.eclipse.compiler.version>3.3.0-01</groovy.eclipse.compiler.version> + <groovy.eclipse.batch.version>2.5.6-02</groovy.eclipse.batch.version> </properties> <!-- to be runnable from command line --> <packaging>jar</packaging> @@ -72,6 +72,7 @@ <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> <version>${groovy.version}</version> + <type>pom</type> </dependency> <dependency> @@ -102,9 +103,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>2.22.0</version> <configuration> <skipTests>true</skipTests> + <!-- allow reflection for documentation --> + <argLine>--illegal-access=permit</argLine> </configuration> </plugin> @@ -128,8 +131,8 @@ <!-- generate scripts for benchmarks --> <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <executions> <!-- script for on-rest memory benchmark --> <execution> @@ -140,9 +143,14 @@ </goals> <!-- 0 data samples == empty config file, therefore same as honeycomb on rest --> <configuration> - <source> - io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-on-rest-out", 0) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator + MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-on-rest-out", 0) + ]]> + </script> + </scripts> </configuration> </execution> <!-- script for memory benchmark with 1000 nodes in config data--> @@ -153,9 +161,14 @@ <goal>execute</goal> </goals> <configuration> - <source> - io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 1000) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator + MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 1000) + ]]> + </script> + </scripts> </configuration> </execution> <!-- script for memory benchmark with 10000 nodes in config data--> @@ -166,9 +179,14 @@ <goal>execute</goal> </goals> <configuration> - <source> - io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 10000) - </source> + <scripts> + <script> + <![CDATA[ + import io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator + MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 10000) + ]]> + </script> + </scripts> </configuration> </execution> </executions> diff --git a/infra/minimal-distribution-core/pom.xml b/infra/minimal-distribution-core/pom.xml index ce41ada16..463f5f0c8 100644 --- a/infra/minimal-distribution-core/pom.xml +++ b/infra/minimal-distribution-core/pom.xml @@ -132,6 +132,10 @@ <version>${commons-io.version}</version> </dependency> <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> <version>1.1.1</version> diff --git a/infra/minimal-distribution-test/pom.xml b/infra/minimal-distribution-test/pom.xml index c8f207bd7..fe3eea2f5 100644 --- a/infra/minimal-distribution-test/pom.xml +++ b/infra/minimal-distribution-test/pom.xml @@ -88,7 +88,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java b/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java index 0a9bd9cdf..970687132 100644 --- a/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java +++ b/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java @@ -55,13 +55,13 @@ public class ActiveModuleProviderTest { assertThat(activeModules, hasItem(isA(Modules.ChildModule3.class))); } - @Test(expected = IllegalStateException.class) + @Test public void testLoadActiveModulesFailed() { final ImmutableList rawResources = of( "// this should be skipped", "// io.fd.honeycomb.infra.distro.Modules$ChildModule1", " io.fd.honeycomb.infra.distro.Modules$ChildModule2", - "### io.fd.honeycomb.infra.distro.Modules$ChildModule3 ",// it should fail because of this + "io.fd.honeycomb.infra.distro.Modules$ChildModule3 ",// it should fail because of this "io.fd.honeycomb.infra.distro.Modules$ChildModule3", "io.fd.honeycomb.infra.distro.Modules$NonModule" ); diff --git a/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerTracker.java b/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerTracker.java index 01c9750ef..a8f592b07 100644 --- a/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerTracker.java +++ b/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerTracker.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Starts & stops notification producer dependencies on demand. + * Starts & stops notification producer dependencies on demand. * Uses {@link DOMNotificationSubscriptionListenerRegistry} to receive subscription change notifications. */ @ThreadSafe diff --git a/infra/test-utils/test-tools/pom.xml b/infra/test-utils/test-tools/pom.xml index 2e4a5a795..5a32c1ea8 100644 --- a/infra/test-utils/test-tools/pom.xml +++ b/infra/test-utils/test-tools/pom.xml @@ -88,6 +88,10 @@ <artifactId>commons-lang3</artifactId> <version>3.8.1</version> </dependency> - + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <scope>compile</scope> + </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java index ae5164bf5..035e5993d 100644 --- a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java +++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * Generic initializer. - * <p/> + * * Capable of invoking 0..n edits as a result of existing operational data. */ @Beta diff --git a/infra/translate-impl/pom.xml b/infra/translate-impl/pom.xml index f62bcaf41..4ac8b5b65 100644 --- a/infra/translate-impl/pom.xml +++ b/infra/translate-impl/pom.xml @@ -72,7 +72,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/GenericListReader.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/GenericListReader.java index d715dde26..8cb0ecffe 100644 --- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/GenericListReader.java +++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/GenericListReader.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; /** * Composite implementation of {@link ListReader} able to place the read result into parent builder object intended * for list node type. - * <p/> + * * This reader checks if the IDs are wildcarded in which case it performs read of all list entries. In case the ID has a * key, it reads only the specified value. */ diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistry.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistry.java index 4783c9cd4..2570e2376 100644 --- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistry.java +++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistry.java @@ -46,8 +46,8 @@ import org.slf4j.LoggerFactory; /** * Simple reader registry able to perform and aggregated read (ROOT read) on top of all provided readers. Also able to * delegate a specific read to one of the delegate readers. - * <p/> - * This could serve as a utility to hold & hide all available readers in upper layers. + * + * This could serve as a utility to hold & hide all available readers in upper layers. */ public final class CompositeReaderRegistry implements ReaderRegistry { diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistryBuilder.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistryBuilder.java index 64585c1af..a53cbda0c 100644 --- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistryBuilder.java +++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistryBuilder.java @@ -86,7 +86,7 @@ public final class CompositeReaderRegistryBuilder /** * Create {@link CompositeReaderRegistry} with Readers ordered according to submitted relationships. - * <p/> + * * Note: The ordering only applies between nodes on the same level, inter-level and inter-subtree relationships are * ignored. */ diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java index bdda21611..0250337b7 100644 --- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java +++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java @@ -90,7 +90,7 @@ final class SubtreeWriter<D extends DataObject> implements Writer<D> { } @Override - public boolean canProcess(@Nonnull InstanceIdentifier<?> instanceIdentifier) { + public boolean canProcess(@Nonnull final InstanceIdentifier<? extends DataObject> instanceIdentifier) { if (isWildcarded) { final Class<D> parent = delegate.getManagedDataObjectType().getTargetType(); for (InstanceIdentifier.PathArgument pathArgument : instanceIdentifier.getPathArguments()) { diff --git a/infra/translate-spi/src/main/java/io/fd/honeycomb/translate/spi/read/InitializingCustomizer.java b/infra/translate-spi/src/main/java/io/fd/honeycomb/translate/spi/read/InitializingCustomizer.java index ce4b2a6e9..5d90166a4 100644 --- a/infra/translate-spi/src/main/java/io/fd/honeycomb/translate/spi/read/InitializingCustomizer.java +++ b/infra/translate-spi/src/main/java/io/fd/honeycomb/translate/spi/read/InitializingCustomizer.java @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * ReadCustomizers which want to participate in the initializing process need to implement this interface. - * <p/> + * * It is triggered after Honeycomb initializes the plugins to give them a change * reconcile(put data in HC in sync with underlying layer) with the underlying layer. */ diff --git a/infra/translate-utils/pom.xml b/infra/translate-utils/pom.xml index 8653f22de..5de5020ab 100644 --- a/infra/translate-utils/pom.xml +++ b/infra/translate-utils/pom.xml @@ -74,7 +74,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java index 2bd2de1ec..87e986430 100644 --- a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java +++ b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java @@ -142,7 +142,7 @@ public final class RWUtils { /** * Transform a keyed instance identifier into a wildcarded one. - * <p/> + * * ! This has to be called also for wildcarded List instance identifiers * due to weird behavior of equals in InstanceIdentifier ! */ diff --git a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/cache/DumpCacheManager.java b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/cache/DumpCacheManager.java index a9e958240..a201b75ee 100644 --- a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/cache/DumpCacheManager.java +++ b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/cache/DumpCacheManager.java @@ -53,12 +53,12 @@ public final class DumpCacheManager<T, U> { } /** - * Returns {@link Optional<T>} of dump + * Returns {@link Optional} of dump * * @param identifier identifier for origin of dumping context * @param cache modification cache of current transaction * @throws ReadFailedException if execution of dumping request failed - * @returns If present in cache ,returns cached instance, if not, tries to dump data using provided executor, + * @return If present in cache ,returns cached instance, if not, tries to dump data using provided executor, * otherwise Optional.empty() */ public Optional<T> getDump(@Nonnull final InstanceIdentifier<?> identifier, @@ -68,13 +68,13 @@ public final class DumpCacheManager<T, U> { } /** - * Returns {@link Optional<T>} of dump + * Returns {@link Optional} of dump * * @param identifier identifier for origin of dumping context * @param cache modification cache of current transaction * @param dumpParams parameters to configure dump request * @throws ReadFailedException if execution of dumping request failed - * @returns If present in cache ,returns cached instance, if not, tries to dump data using provided executor, + * @return If present in cache ,returns cached instance, if not, tries to dump data using provided executor, * otherwise Optional.empty() */ public Optional<T> getDump(@Nonnull final InstanceIdentifier<?> identifier, |