From 3b216c87b38125d3e087bbff689ee4611dcaaabf Mon Sep 17 00:00:00 2001 From: shueja-personal Date: Thu, 11 Jan 2024 18:58:09 -0800 Subject: [PATCH] remove commented lazy logic --- .../src/generate/java/NTLogger.java.jinja | 132 +++--------------- 1 file changed, 20 insertions(+), 112 deletions(-) diff --git a/monologue/src/generate/java/NTLogger.java.jinja b/monologue/src/generate/java/NTLogger.java.jinja index 6df82fe..575df80 100644 --- a/monologue/src/generate/java/NTLogger.java.jinja +++ b/monologue/src/generate/java/NTLogger.java.jinja @@ -88,29 +88,11 @@ class NTLogger extends GenericLogger { {%endif%} LongConsumer consumer; {%if t.TypeName == 'IntegerArray'%} - // if (this.isLazy()) { - // consumer = new LongConsumer() { - // private long[] lastValue = new long[] {}; - // @Override - // public void accept(long timestamp) { - // var intarr = valueSupplier.get(); - // if (intarr == null) { return;} - // var value = toLongArray(valueSupplier.get()); - // if (!(Arrays.equals(value, lastValue))) { - // entry.set(value, timestamp); - // lastValue = value; - // } - - - // } - // }; - // } else { - consumer = (timestamp) -> { - var value = valueSupplier.get(); - if (value == null) { return;} - entry.set(toLongArray(value), timestamp); - }; - // } + consumer = (timestamp) -> { + var value = valueSupplier.get(); + if (value == null) { return;} + entry.set(toLongArray(value), timestamp); + }; addField( entryName, @@ -124,54 +106,12 @@ class NTLogger extends GenericLogger { entry::unpublish ); {%else%} -{%if t.java.IsArray == true%} - // if (this.isLazy()) { - // consumer = new LongConsumer() { - // private {{t.java.ValueType}} lastValue = new {{t.java.ValueType}} {}; - // @Override - // public void accept(long timestamp) { - // var value = valueSupplier.get(); - // if (value == null) { return;} - // {%if t.TypeName == 'StringArray'%} - // if (!(Arrays.deepEquals(value, lastValue))) { - // {%else%} - // if (!(Arrays.equals(value, lastValue))) { - // {%endif%} - // entry.set(value, timestamp); - // lastValue = value; - // } - // } - // }; - // } else { - consumer = (timestamp) -> { - var value = valueSupplier.get(); - if (value != null) { - entry.set(value, timestamp); - } - }; - // } -{%else%} - // if (this.isLazy()) { - // consumer = new LongConsumer() { - // private {{t.java.ValueType}} lastValue = {{t.java.EmptyValue}}; - // @Override - // public void accept(long timestamp) { - - // var value = valueSupplier.get(); - // if (value == null) { return; } - // if (value != lastValue) { - // entry.set(value, timestamp); - // lastValue = value; - // } - // } - // }; - // } else { - consumer = (timestamp) -> { - var value = valueSupplier.get(); - if (value == null) { return; } + consumer = (timestamp) -> { + var value = valueSupplier.get(); + if (value != null) { entry.set(value, timestamp); - }; - // } + } + }; {%endif%} addField( @@ -195,28 +135,11 @@ class NTLogger extends GenericLogger { var publisher = topic.publish(); LongConsumer consumer; - - // if (this.isLazy()) { - // consumer = new LongConsumer() { - // private R lastValue = null; - // @Override - // public void accept(long timestamp) { - - // var value = valueSupplier.get(); - // if (value == null) { return;} - // if (!(value.equals(lastValue))) { - // publisher.set(value, timestamp); - // lastValue = value; - // } - // } - // }; - // } else { - consumer = (timestamp) -> { - var value = valueSupplier.get(); - if (value == null) { return;} - publisher.set(value, timestamp); - }; - // } + consumer = (timestamp) -> { + var value = valueSupplier.get(); + if (value == null) { return;} + publisher.set(value, timestamp); + }; addField( entryName, @@ -238,26 +161,11 @@ class NTLogger extends GenericLogger { LongConsumer consumer; - // if (this.isLazy()) { - // consumer = new LongConsumer() { - // private R[] lastValue = null; - // @Override - // public void accept(long timestamp) { - // var value = (R[]) valueSupplier.get(); - // if (value == null) {return;} - // if (!(Arrays.deepEquals(value, lastValue))) { - // publisher.set(value, timestamp); - // lastValue = value; - // } - // } - // }; - // } else { - consumer = (timestamp) -> { - var value = valueSupplier.get(); - if (value == null) {return;} - publisher.set(value, timestamp); - }; - // } + consumer = (timestamp) -> { + var value = valueSupplier.get(); + if (value == null) {return;} + publisher.set(value, timestamp); + }; addField( entryName,