Merge branch 'master' into add_redis_connector

fabian4 · fabian4 · commit 5a9c815ceecd · 2023-07-26T16:00:59.000+08:00
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/AssertUtils.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/AssertUtils.java
@@ -27,34 +27,34 @@
 public final class AssertUtils {
 
     /**
-     * assert obj not null
+     * Assert obj is not null
      *
-     * @param obj     obj
+     * @param obj  Object to test
      * @param message error message
      */
     public static void notNull(final Object obj, final String message) {
         isTrue(Objects.nonNull(obj), message);
     }
 
     /**
-     * assert test is true
+     * Assert condition is true
      *
-     * @param test    test
+     * @param condition  boolean to test
      * @param message error message
      */
-    public static void isTrue(final Boolean test, final String message) {
-        if (!Boolean.TRUE.equals(test)) {
+    public static void isTrue(final Boolean condition, final String message) {
+        if (!Boolean.TRUE.equals(condition)) {
             throw new IllegalArgumentException(message);
         }
     }
 
     /**
-     * assert str is not black
+     * Assert str is not blank
      *
-     * @param str     str
-     * @param message message
+     * @param str  String to test
+     * @param message error message
      */
-    public static void notBlack(final String str, final String message) {
+    public static void notBlank(final String str, final String message) {
         isTrue(StringUtils.isNoneBlank(str), message);
     }
 
diff --git a/eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/AssertUtilsTest.java b/eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/AssertUtilsTest.java
@@ -22,7 +22,7 @@
 /**
  * test {@link AssertUtils}
  */
-public class AssertTest {
+public class AssertUtilsTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testNotNull() {
@@ -33,4 +33,4 @@ public void testNotNull() {
     public void testIsTrue() {
         AssertUtils.isTrue(false, "error message");
     }
-}
+}
diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/src/main/java/org/apache/eventmesh/protocol/cloudevents/resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java b/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/src/main/java/org/apache/eventmesh/protocol/cloudevents/resolver/grpc/GrpcEventMeshCloudEventProtocolResolver.java
@@ -17,13 +17,13 @@
 
 package org.apache.eventmesh.protocol.cloudevents.resolver.grpc;
 
-
 import org.apache.eventmesh.common.protocol.grpc.cloudevents.CloudEvent;
 import org.apache.eventmesh.common.protocol.grpc.cloudevents.CloudEventBatch;
 import org.apache.eventmesh.common.protocol.grpc.common.EventMeshCloudEventWrapper;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import io.cloudevents.core.format.EventFormat;
@@ -40,15 +40,14 @@ public class GrpcEventMeshCloudEventProtocolResolver {
     private static final EventFormat eventFormat = EventFormatProvider.getInstance().resolveFormat(ProtobufFormat.PROTO_CONTENT_TYPE);
 
     public static io.cloudevents.CloudEvent buildEvent(CloudEvent cloudEvent) {
-        io.cloudevents.CloudEvent event = eventFormat.deserialize(cloudEvent.toByteArray());
-        return event;
+        return Objects.requireNonNull(eventFormat).deserialize(cloudEvent.toByteArray());
     }
 
     public static List<io.cloudevents.CloudEvent> buildBatchEvents(CloudEventBatch cloudEventBatch) {
         if (cloudEventBatch == null || cloudEventBatch.getEventsCount() < 1) {
             return new ArrayList<>(0);
         }
-        return cloudEventBatch.getEventsList().stream().map(cloudEvent -> eventFormat.deserialize(cloudEvent.toByteArray()))
+        return cloudEventBatch.getEventsList().stream().map(cloudEvent -> Objects.requireNonNull(eventFormat).deserialize(cloudEvent.toByteArray()))
             .collect(Collectors.toList());
     }
 
@@ -57,7 +56,7 @@ public static EventMeshCloudEventWrapper buildEventMeshCloudEvent(io.cloudevents
             return new EventMeshCloudEventWrapper(null);
         }
         try {
-            return new EventMeshCloudEventWrapper(CloudEvent.parseFrom(eventFormat.serialize(cloudEvent)));
+            return new EventMeshCloudEventWrapper(CloudEvent.parseFrom(Objects.requireNonNull(eventFormat).serialize(cloudEvent)));
         } catch (InvalidProtocolBufferException e) {
             log.error("Build Event Mesh CloudEvent from io.cloudevents.CloudEvent error", e);
         }
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/inf/AbstractEventProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/inf/AbstractEventProcessor.java
@@ -248,7 +248,7 @@ public static String post(CloseableHttpClient client, String uri,
         Map<String, String> requestHeader, Map<String, Object> requestBody,
         ResponseHandler<String> responseHandler) throws IOException {
         AssertUtils.notNull(client, "client can't be null");
-        AssertUtils.notBlack(uri, "uri can't be null");
+        AssertUtils.notBlank(uri, "uri can't be null");
         AssertUtils.notNull(requestHeader, "requestParam can't be null");
         AssertUtils.notNull(responseHandler, "responseHandler can't be null");
 
diff --git a/eventmesh-sdks/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/grpc/consumer/EventMeshGrpcConsumerTest.java b/eventmesh-sdks/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/grpc/consumer/EventMeshGrpcConsumerTest.java
@@ -138,7 +138,7 @@ public EventMeshProtocolType getProtocolType() {
             }
         });
         eventMeshGrpcConsumer.subscribe(Collections.singletonList(buildMockSubscriptionItem()));
-        assertThat(eventMeshGrpcConsumer.getSubscriptionMap().size()).isEqualTo(1);
+        assertThat(eventMeshGrpcConsumer.getSubscriptionMap()).hasSize(1);
 
         assertThat(result).hasSize(1).first().isInstanceOf(CloudEventV1.class);
         CloudEventV1 v1 = (CloudEventV1) result.get(0);

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public EventMeshProtocolType getProtocolType() {`
`138`	`138`	`}`
`139`	`139`	`});`
`140`	`140`	`eventMeshGrpcConsumer.subscribe(Collections.singletonList(buildMockSubscriptionItem()));`
`141`		`- assertThat(eventMeshGrpcConsumer.getSubscriptionMap().size()).isEqualTo(1);`
	`141`	`+ assertThat(eventMeshGrpcConsumer.getSubscriptionMap()).hasSize(1);`
`142`	`142`
`143`	`143`	`assertThat(result).hasSize(1).first().isInstanceOf(CloudEventV1.class);`
`144`	`144`	`CloudEventV1 v1 = (CloudEventV1) result.get(0);`