You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ld...@apache.org on 2020/05/05 23:27:20 UTC

[plc4x] 01/02: Fix generic boundaries for ConversationContext and wrapper of BitOutput.

This is an automated email from the ASF dual-hosted git repository.

ldywicki pushed a commit to branch features/generated-ads-driver
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit f738bc4fc963a09bc06d1022220ac5e8c50c06f2
Author: Ɓukasz Dywicki <lu...@code-house.org>
AuthorDate: Wed Apr 15 00:23:13 2020 +0200

    Fix generic boundaries for ConversationContext and wrapper of BitOutput.
---
 .../src/main/java/org/apache/plc4x/java/spi/ConversationContext.java | 2 +-
 .../org/apache/plc4x/java/spi/generation/io/MyDefaultBitOutput.java  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/ConversationContext.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/ConversationContext.java
index cce28ca..88e9661 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/ConversationContext.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/ConversationContext.java
@@ -58,7 +58,7 @@ public interface ConversationContext<T> {
         <R> SendRequestContext<R> only(Class<R> clazz);
     }
 
-    ExpectRequestContext expectRequest(Class<T> clazz, Duration timeout);
+    ExpectRequestContext<T> expectRequest(Class<T> clazz, Duration timeout);
 
     interface ExpectRequestContext<T> {
 
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/io/MyDefaultBitOutput.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/io/MyDefaultBitOutput.java
index 086a8e6..a1fc39d 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/io/MyDefaultBitOutput.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/io/MyDefaultBitOutput.java
@@ -23,15 +23,14 @@ import com.github.jinahya.bit.io.DefaultBitOutput;
 
 import java.nio.ByteBuffer;
 
-public class MyDefaultBitOutput extends DefaultBitOutput<BufferByteOutput> {
+public class MyDefaultBitOutput extends DefaultBitOutput<BufferByteOutput<ByteBuffer>> {
 
     public MyDefaultBitOutput(BufferByteOutput delegate) {
         super(delegate);
     }
 
-    @SuppressWarnings("unchecked")
     public long getPos() {
-        return ((BufferByteOutput<ByteBuffer>) getDelegate()).getTarget().position();
+        return getDelegate().getTarget().position();
     }
 
 }