diff options
author | Michal Cmarada <mcmarada@cisco.com> | 2019-04-10 17:43:54 +0200 |
---|---|---|
committer | Michal Cmarada <mcmarada@cisco.com> | 2019-04-10 17:43:54 +0200 |
commit | a7a8f9822082e533096e5bdecc531cbaea0f3931 (patch) | |
tree | 0b13a21e2360c273eb3d3593bccc37d6474ffb2b /infra/translate-impl | |
parent | 9401e2bf0cd137b0cb57b2ac86cbd643d5460b60 (diff) |
HONEYCOMB-448: JAVA 11 support
- updated dependencies
- compilation error fixes
Change-Id: Iad9d353d06c113a0da892ff11a442e4b41edae0d
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'infra/translate-impl')
5 files changed, 6 insertions, 6 deletions
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()) { |