Merge pull request #56 from sashirestela/55-fix-residual-code-smells

Fixing residual code smells
sashirestela · Mar 19, 2024 · c9d428d · c9d428d
2 parents cf6a6e4 + 315817b
commit c9d428d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.github.sashirestela</groupId>
   <artifactId>cleverclient</artifactId>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <packaging>jar</packaging>
 
   <name>cleverclient</name>

diff --git a/src/main/java/io/github/sashirestela/cleverclient/metadata/InterfaceMetadataStore.java b/src/main/java/io/github/sashirestela/cleverclient/metadata/InterfaceMetadataStore.java
@@ -12,6 +12,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -79,12 +80,7 @@ private List<AnnotationMetadata> getAnnotations(Annotation[] javaAnnotations) {
         for (var javaAnnotation : javaAnnotations) {
             Map<String, String> valueByField = new HashMap<>();
             for (var javaAnnotMethod : javaAnnotation.annotationType().getDeclaredMethods()) {
-                Object object;
-                try {
-                    object = javaAnnotMethod.invoke(javaAnnotation, (Object[]) null);
-                } catch (Exception e) {
-                    object = null;
-                }
+                Object object = getAnnotationValue(javaAnnotation, javaAnnotMethod);
                 if (object instanceof Annotation[]) {
                     isAnnotArray = true;
                     annotations.addAll(getAnnotations((Annotation[]) object));
@@ -142,4 +138,14 @@ private void validate(InterfaceMetadata interfaceMetadata) {
         });
     }
 
+    private Object getAnnotationValue(Annotation javaAnnotation, Method javaAnnotMethod) {
+        Object object;
+        try {
+            object = javaAnnotMethod.invoke(javaAnnotation, (Object[]) null);
+        } catch (Exception e) {
+            object = null;
+        }
+        return object;
+    }
+
 }
diff --git a/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncStreamSender.java b/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncStreamSender.java
@@ -23,11 +23,11 @@ public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest,
             final var lineRecord = new CleverClientSSE.LineRecord();
 
             return response.body()
-                    .peek(line -> {
+                    .map(line -> {
                         logger.debug("Response : {}", line);
                         lineRecord.updateWith(line);
+                        return new CleverClientSSE(lineRecord);
                     })
-                    .map(line -> new CleverClientSSE(lineRecord))
                     .filter(CleverClientSSE::isActualData)
                     .map(item -> JsonUtil.jsonToObject(item.getActualData(), responseClass));
         });

diff --git a/src/main/java/io/github/sashirestela/cleverclient/sender/HttpSyncStreamSender.java b/src/main/java/io/github/sashirestela/cleverclient/sender/HttpSyncStreamSender.java
@@ -24,11 +24,11 @@ public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest,
             final var lineRecord = new CleverClientSSE.LineRecord();
 
             return httpResponse.body()
-                    .peek(line -> {
+                    .map(line -> {
                         logger.debug("Response : {}", line);
                         lineRecord.updateWith(line);
+                        return new CleverClientSSE(lineRecord);
                     })
-                    .map(line -> new CleverClientSSE(lineRecord))
                     .filter(CleverClientSSE::isActualData)
                     .map(item -> JsonUtil.jsonToObject(item.getActualData(), responseClass));