This is an automated email from the ASF dual-hosted git repository. ldywicki pushed a commit to branch feature/socketcan-0.8-preparations in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 581f961e341bc6a5c3b89db91b0d24a4de314acf Author: Łukasz Dywicki <[email protected]> AuthorDate: Thu Oct 22 12:24:55 2020 +0200 Update callback api. --- .../src/main/java/org/apache/plc4x/java/can/CANOpenPlcDriver.java | 7 +++++++ .../src/main/java/org/apache/plc4x/java/can/listener/Callback.java | 4 ++-- .../java/org/apache/plc4x/java/can/listener/CompositeCallback.java | 3 ++- .../src/test/java/org/apache/plc4x/java/can/Main.java | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/CANOpenPlcDriver.java b/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/CANOpenPlcDriver.java index 732cbfb..3916a15 100644 --- a/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/CANOpenPlcDriver.java +++ b/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/CANOpenPlcDriver.java @@ -29,6 +29,8 @@ import org.apache.plc4x.java.spi.configuration.Configuration; import org.apache.plc4x.java.spi.connection.GeneratedDriverBase; import org.apache.plc4x.java.spi.connection.ProtocolStackConfigurer; import org.apache.plc4x.java.spi.connection.SingleProtocolStackConfigurer; +import org.apache.plc4x.java.spi.optimizer.BaseOptimizer; +import org.apache.plc4x.java.spi.optimizer.SingleFieldOptimizer; import java.util.function.ToIntFunction; @@ -77,6 +79,11 @@ public class CANOpenPlcDriver extends GeneratedDriverBase<CANOpenFrame> { } @Override + protected BaseOptimizer getOptimizer() { + return new SingleFieldOptimizer(); + } + + @Override protected ProtocolStackConfigurer<CANOpenFrame> getStackConfigurer() { return SingleProtocolStackConfigurer.builder(CANOpenFrame.class, CANOpenSocketCANFrameIO.class) .withProtocol(CANOpenProtocolLogic.class) diff --git a/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/listener/Callback.java b/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/listener/Callback.java index 74d8764..2e29d3b 100644 --- a/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/listener/Callback.java +++ b/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/listener/Callback.java @@ -1,8 +1,8 @@ package org.apache.plc4x.java.can.listener; -import org.apache.plc4x.java.socketcan.readwrite.SocketCANFrame; +import org.apache.plc4x.java.can.canopen.CANOpenFrame; public interface Callback { - void receive(SocketCANFrame frame); + void receive(CANOpenFrame frame); } diff --git a/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/listener/CompositeCallback.java b/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/listener/CompositeCallback.java index 3ff5454..10fd72f 100644 --- a/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/listener/CompositeCallback.java +++ b/sandbox/test-java-can-driver/src/main/java/org/apache/plc4x/java/can/listener/CompositeCallback.java @@ -1,5 +1,6 @@ package org.apache.plc4x.java.can.listener; +import org.apache.plc4x.java.can.canopen.CANOpenFrame; import org.apache.plc4x.java.socketcan.readwrite.SocketCANFrame; import java.util.List; @@ -10,7 +11,7 @@ public class CompositeCallback implements Callback { private List<Callback> callbacks = new CopyOnWriteArrayList<>(); @Override - public void receive(SocketCANFrame frame) { + public void receive(CANOpenFrame frame) { callbacks.forEach(callback -> callback.receive(frame)); } diff --git a/sandbox/test-java-can-driver/src/test/java/org/apache/plc4x/java/can/Main.java b/sandbox/test-java-can-driver/src/test/java/org/apache/plc4x/java/can/Main.java index f5550ae..84c96a0 100644 --- a/sandbox/test-java-can-driver/src/test/java/org/apache/plc4x/java/can/Main.java +++ b/sandbox/test-java-can-driver/src/test/java/org/apache/plc4x/java/can/Main.java @@ -23,6 +23,7 @@ import org.apache.plc4x.java.api.PlcConnection; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcReadResponse; import org.apache.plc4x.java.api.messages.PlcWriteResponse; +import org.apache.plc4x.java.can.canopen.CANOpenFrame; import org.apache.plc4x.java.can.context.CANOpenDriverContext; import org.apache.plc4x.java.can.listener.Callback; import org.apache.plc4x.java.socketcan.readwrite.SocketCANFrame; @@ -40,7 +41,7 @@ public class Main { CANOpenDriverContext.CALLBACK.addCallback(new Callback() { @Override - public void receive(SocketCANFrame frame) { + public void receive(CANOpenFrame frame) { //System.err.println("Received frame " + frame); } });
