From e9d3785d0603bf6e024affafc735641ee312b675 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Thu, 9 Aug 2018 10:07:36 +0200
Subject: AbstractGenericWriter: remove xxxCurrent methods

Use xxxCurrentAttributes instead to simplify call graph.

Change-Id: I8201b115354dddd35ca0b63b2c72dfb4eac93646
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 .../translate/impl/write/GenericListWriter.java    | 31 ++++------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

(limited to 'infra/translate-impl')

diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/GenericListWriter.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/GenericListWriter.java
index 5121eb793..ff683b810 100644
--- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/GenericListWriter.java
+++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/GenericListWriter.java
@@ -85,30 +85,14 @@ public final class GenericListWriter<D extends DataObject & Identifiable<K>, K e
     }
 
     @Override
-    protected void writeCurrent(final InstanceIdentifier<D> id, final D data, final WriteContext ctx)
-        throws WriteFailedException {
-        super.writeCurrent(getManagedId(id, data), data, ctx);
-    }
-
-    @Override
-    protected void updateCurrent(final InstanceIdentifier<D> id, final D dataBefore, final D dataAfter,
-                                 final WriteContext ctx) throws WriteFailedException {
-        super.updateCurrent(getManagedId(id, dataBefore), dataBefore, dataAfter, ctx);
-    }
-
-    @Override
-    protected void deleteCurrent(final InstanceIdentifier<D> id, final D dataBefore, final WriteContext ctx)
-        throws WriteFailedException {
-        super.deleteCurrent(getManagedId(id, dataBefore), dataBefore, ctx);
-    }
-
-    @Override
-    protected InstanceIdentifier<D> getManagedId(@Nonnull final InstanceIdentifier<? extends DataObject> currentId,
-                                                 @Nonnull final D current) {
+    @SuppressWarnings("unchecked")
+    protected InstanceIdentifier<D> getSpecificId(@Nonnull final InstanceIdentifier<? extends DataObject> currentId,
+                                                  @Nonnull final D current) {
         final InstanceIdentifier<D> id = (InstanceIdentifier<D>) currentId;
         // Make sure the key is present
         if (isWildcarded(id)) {
-            return getSpecificId(id, current);
+            return RWUtils.replaceLastInId(id,
+                new InstanceIdentifier.IdentifiableItem<>(id.getTargetType(), current.getKey()));
         } else {
             return id;
         }
@@ -117,9 +101,4 @@ public final class GenericListWriter<D extends DataObject & Identifiable<K>, K e
     private boolean isWildcarded(final InstanceIdentifier<D> id) {
         return id.firstIdentifierOf(getManagedDataObjectType().getTargetType()).isWildcarded();
     }
-
-    private InstanceIdentifier<D> getSpecificId(final InstanceIdentifier<D> currentId, final D current) {
-        return RWUtils.replaceLastInId(currentId,
-            new InstanceIdentifier.IdentifiableItem<>(currentId.getTargetType(), current.getKey()));
-    }
 }
-- 
cgit 1.2.3-korg