From 26e7c2dcd0d1b1e5d9efb475eeb78effb897a731 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 23 Aug 2017 12:42:05 +0200 Subject: Move StaticCacheKeyFactory to honeycomb project Requires https://gerrit.fd.io/r/#/c/8169/ Change-Id: Ibb1482d350f4739c3ab33bc0ff678f06335af48c Signed-off-by: Marek Gradzki --- .../hc2vpp/v3po/interfacesstate/TapCustomizer.java | 6 +-- .../v3po/interfacesstate/VhostUserCustomizer.java | 7 ++-- .../cache/InterfaceCacheDumpManagerImpl.java | 3 +- .../cache/StaticCacheKeyFactory.java | 45 ---------------------- 4 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/StaticCacheKeyFactory.java diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java index f990e0fc5..829ba827e 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapCustomizer.java @@ -24,13 +24,13 @@ import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; -import io.fd.hc2vpp.v3po.interfacesstate.cache.StaticCacheKeyFactory; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; +import io.fd.honeycomb.translate.util.read.cache.StaticCacheKeyFactory; import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; import io.fd.vpp.jvpp.core.dto.SwInterfaceTapDetails; import io.fd.vpp.jvpp.core.dto.SwInterfaceTapDetailsReplyDump; @@ -67,8 +67,8 @@ public class TapCustomizer extends FutureJVppCustomizer this.interfaceContext = interfaceContext; this.dumpManager = dumpManager; this.tapDumpManager = new DumpCacheManager.DumpCacheManagerBuilder() - .withCacheKeyFactory(new StaticCacheKeyFactory(TapCustomizer.class.getName() + "_dump")) - .acceptOnly(SwInterfaceTapDetailsReplyDump.class) + .withCacheKeyFactory(new StaticCacheKeyFactory(TapCustomizer.class.getName() + "_dump", + SwInterfaceTapDetailsReplyDump.class)) .withExecutor((identifier, params) -> { // Full Tap dump has to be performed here, no filter or anything is here to help so at least we cache it return getReplyForRead(getFutureJVpp() diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java index 1123b405b..7d5aed945 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java @@ -22,13 +22,13 @@ import static java.lang.String.format; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager; -import io.fd.hc2vpp.v3po.interfacesstate.cache.StaticCacheKeyFactory; import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.Initialized; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; +import io.fd.honeycomb.translate.util.read.cache.StaticCacheKeyFactory; import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; import io.fd.vpp.jvpp.core.dto.SwInterfaceVhostUserDetails; import io.fd.vpp.jvpp.core.dto.SwInterfaceVhostUserDetailsReplyDump; @@ -50,7 +50,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - public class VhostUserCustomizer implements InitializingReaderCustomizer, InterfaceDataTranslator, JvppReplyConsumer { @@ -66,8 +65,8 @@ public class VhostUserCustomizer implements InitializingReaderCustomizer() - .acceptOnly(SwInterfaceVhostUserDetailsReplyDump.class) - .withCacheKeyFactory(new StaticCacheKeyFactory(VhostUserCustomizer.class.getName() + "_dump")) + .withCacheKeyFactory(new StaticCacheKeyFactory(VhostUserCustomizer.class.getName() + "_dump", + SwInterfaceVhostUserDetailsReplyDump.class)) .withExecutor((identifier, params) -> { final CompletionStage swInterfaceVhostUserDetailsReplyDumpCompletionStage = diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java index e9b114018..adfd3f34f 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java @@ -27,6 +27,7 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; import io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor; +import io.fd.honeycomb.translate.util.read.cache.StaticCacheKeyFactory; import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails; import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump; import io.fd.vpp.jvpp.core.dto.SwInterfaceDump; @@ -58,7 +59,7 @@ final class InterfaceCacheDumpManagerImpl implements InterfaceCacheDumpManager { this.namingContext = namingContext; specificDumpManager = specificInterfaceDumpManager(jvpp); fullDumpManager = fullInterfaceDumpManager(jvpp, - new StaticCacheKeyFactory(StaticCacheKeyFactory.class.getName() + "_dump")); + new StaticCacheKeyFactory(InterfaceCacheDumpManagerImpl.class.getName() + "_dump", SwInterfaceDetailsReplyDump.class)); } @Override diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/StaticCacheKeyFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/StaticCacheKeyFactory.java deleted file mode 100644 index e34e915e2..000000000 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/StaticCacheKeyFactory.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2017 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.fd.hc2vpp.v3po.interfacesstate.cache; - -import io.fd.honeycomb.translate.util.read.cache.CacheKeyFactory; -import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -public class StaticCacheKeyFactory implements CacheKeyFactory { - - private final String key; - - public StaticCacheKeyFactory(@Nonnull final String key) { - this.key = key; - } - - @Nonnull - @Override - public String createKey(@Nonnull final InstanceIdentifier actualContextIdentifier, - @Nullable final Void dumpParams) { - return key; - } - - @Nonnull - @Override - public Class getCachedDataType() { - return SwInterfaceDetailsReplyDump.class; - } -} -- cgit 1.2.3-korg