fix: update ProtoWrapper definition

iamceph · Mar 23, 2022 · e7b653e · e7b653e
1 parent 648de1e
commit e7b653e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/resulter-core/src/main/java/com/iamceph/resulter/core/pack/Packeto.java b/resulter-core/src/main/java/com/iamceph/resulter/core/pack/Packeto.java
@@ -6,9 +6,11 @@
 import com.iamceph.resulter.core.DataResultable;
 import com.iamceph.resulter.core.Resultable;
 import com.iamceph.resulter.core.model.ResultableData;
+
 import lombok.experimental.UtilityClass;
 import lombok.val;
 import lombok.var;
+
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -50,8 +52,14 @@ public ResultableData pack(@NotNull DataResultable<?> input) {
         if (data instanceof ProtoWrapper) {
             final var wrapped = (ProtoWrapper<?>) data;
             final var message = wrapped.asProto();
+            if (!(message instanceof ProtoWrapper)) {
+                val errorResult = DataResultable.fail("Cannot convert data - " + data.getClass().getSimpleName());
+                return ResultableData.newBuilder()
+                        .setResult(errorResult.asProto())
+                        .build();
+            }
 
-            return buildMessage(input, message);
+            return buildMessage(input, (Message) message);
         }
 
         val errorResult = DataResultable.fail("Cannot convert data - " + data.getClass().getSimpleName());

diff --git a/resulter-core/src/main/java/com/iamceph/resulter/core/pack/ProtoWrapper.java b/resulter-core/src/main/java/com/iamceph/resulter/core/pack/ProtoWrapper.java
@@ -1,13 +1,11 @@
 package com.iamceph.resulter.core.pack;
 
-import com.google.protobuf.Message;
-
 /**
  * A wrapper for .proto conversions.
  *
- * @param <T> .proto type of this class
+ * @param <T> result of the asProto
  */
-public interface ProtoWrapper<T extends Message> {
+public interface ProtoWrapper<T> {
     /**
      * Wraps current wrapper into a .proto class
      *