Merge pull request #2 from apache/master

update
apache · Nov 10, 2022 · 57f8525 · 57f8525
2 parents acafcc6 + 6b2c0a9
commit 57f8525
Show file tree

Hide file tree

Showing 8 changed files with 708 additions and 25 deletions.
diff --git a/...h-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientHandler.java b/...h-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientHandler.java
@@ -51,8 +51,7 @@ public ShowClientHandler(EventMeshTCPServer eventMeshTCPServer) {
     @Override
     public void handle(HttpExchange httpExchange) throws IOException {
         StringBuilder result = new StringBuilder();
-        OutputStream out = httpExchange.getResponseBody();
-        try {
+        try (OutputStream out = httpExchange.getResponseBody()) {
             String newLine = System.getProperty("line.separator");
             logger.info("showAllClient=================");
             ClientSessionGroupMapping clientSessionGroupMapping = eventMeshTCPServer.getClientSessionGroupMapping();
@@ -79,15 +78,6 @@ public void handle(HttpExchange httpExchange) throws IOException {
             out.write(result.toString().getBytes(Constants.DEFAULT_CHARSET));
         } catch (Exception e) {
             logger.error("ShowClientHandler fail...", e);
-        } finally {
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    logger.warn("out close failed...", e);
-                }
-            }
         }
-
     }
 }
diff --git a/.../main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java b/.../main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java
@@ -54,8 +54,7 @@ public ShowListenClientByTopicHandler(EventMeshTCPServer eventMeshTCPServer) {
     @Override
     public void handle(HttpExchange httpExchange) throws IOException {
         StringBuilder result = new StringBuilder();
-        OutputStream out = httpExchange.getResponseBody();
-        try {
+        try(OutputStream out = httpExchange.getResponseBody();) {
             String queryString = httpExchange.getRequestURI().getQuery();
             Map<String, String> queryStringInfo = NetUtils.formData2Dic(queryString);
             String topic = queryStringInfo.get(EventMeshConstants.MANAGE_TOPIC);
@@ -82,15 +81,6 @@ public void handle(HttpExchange httpExchange) throws IOException {
             out.write(result.toString().getBytes(Constants.DEFAULT_CHARSET));
         } catch (Exception e) {
             logger.error("ShowListenClientByTopicHandler fail...", e);
-        } finally {
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    logger.warn("out close failed...", e);
-                }
-            }
         }
-
     }
 }
diff --git a/tools/third-party-licenses/LICENSE b/tools/third-party-licenses/LICENSE
@@ -217,6 +217,12 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
 
     assertj-core 2.6.0: https://github.com/assertj/assertj-core, Apache 2.0
     async-http-client 2.12.0: https://https://github.com/AsyncHttpClient/async-http-client, Apache 2.0
+    bcpkix-jdk15on 1.69: https://github.com/bcgit/bc-java, Apache 2.0
+    bcprov-jdk15on 1.69: https://github.com/bcgit/bc-java, Apache 2.0
+    bcprov-ext-jdk15on 1.69: https://github.com/bcgit/bc-java, Apache 2.0
+    bcutil-jdk15on 1.69: https://github.com/bcgit/bc-java, Apache 2.0
+    byte-buddy 1.11.0: https://github.com/raphw/byte-buddy, Apache 2.0
+    cache-api 1.1.1: https://github.com/jsr107/jsr107spec, Apache 2.0
     cloudevents-api 2.2.0: https://github.com/cloudevents/sdk-java, Apache 2.0
     cloudevents-core 2.2.0: https://github.com/cloudevents/sdk-java, Apache 2.0
     cloudevents-json-jackson 2.2.0: https://github.com/cloudevents/sdk-java, Apache 2.0
@@ -230,13 +236,17 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     commons-logging 1.2: https://github.com/apache/commons-logging, Apache 2.0
     commons-text 1.9: https://github.com/apache/commons-text, Apache 2.0
     commons-validator 1.7: https://github.com/apache/commons-validator, Apache 2.0
+    curator-client 4.0.1: https://github.com/apache/curator, Apache 2.0
+    curator-framework 4.0.1: https://github.com/apache/curator, Apache 2.0
+    curator-recipes 4.0.1: https://github.com/apache/curator, Apache 2.0
     disruptor 3.4.2: https://github.com/LMAX-Exchange/disruptor, Apache 2.0
     dledger 0.2.3: https://github.com/openmessaging/dledger, Apache 2.0
     error_prone_annotations 2.7.1: https://github.com/google/error-prone, Apache 2.0
     failureaccess 1.0.1: https://github.com/google/guava, Apache 2.0
     listenablefuture 9999.0-empty-to-avoid-conflict-with-guava: https://github.com/google/guava, Apache 2.0
     fastjson 1.2.76: https://github.com/alibaba/fastjson, Apache 2.0
     guava 31.0.1-jre: https://github.com/google/guava, Apache 2.0
+    grpc-api 1.43.2: https://github.com/grpc/grpc-java, Apache-2.0
     grpc-context 1.42.2: https://github.com/grpc/grpc-java, Apache 2.0
     grpc-core 1.42.2: https://github.com/grpc/grpc-java, Apache 2.0
     grpc-netty 1.42.2: https://github.com/grpc/grpc-java, Apache 2.0
@@ -254,6 +264,10 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     jackson-core 2.13.0: https://github.com/FasterXML/jackson-core, Apache 2.0
     jackson-databind 2.13.0: https://github.com/FasterXML/jackson-databind, Apache 2.0
     javassist 3.24.0-GA/3.24.0-GA: https://github.com/jboss-javassist/javassist, Apache 2.0
+    javax.inject 1: https://github.com/javax-inject/javax-inject, Apache 2.0
+    jboss-marshalling 2.0.11.Final:https://github.com/jboss-remoting/jboss-marshalling, Apache 2.0
+    jboss-marshalling-river 2.0.11.Final: https://github.com/jboss-remoting/jboss-marshalling, Apache 2.0
+    jcip-annotations 1.0: https://github.com/stephenc/jcip-annotations, Apache 2.0
     jcommander 1.72: https://github.com/cbeust/jcommander, Apache 2.0
     jetcd-common 0.3.0: https://github.com/etcd-io/jetcd, Apache 2.0
     jetcd-core 0.3.0: https://github.com/etcd-io/jetcd, Apache 2.0
@@ -266,7 +280,9 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     metrics-core 4.1.0: https://github.com/dropwizard/metrics, Apache 2.0
     metrics-healthchecks 4.1.0: https://github.com/dropwizard/metrics, Apache 2.0
     metrics-json 4.1.0: https://github.com/dropwizard/metrics, Apache 2.0
+    nacos-auth-plugin 2.1.0: https://github.com/alibaba/nacos, Apache 2.0
     nacos-client 2.0.4: https://github.com/alibaba/nacos, Apache 2.0
+    nacos-encryption-plugin 2.1.0: https://github.com/alibaba/nacos, Apache 2.0
     netty-all 4.1.73.Final: https://github.com/netty/netty/tree/netty-4.1.73.Final, Apache 2.0
     netty-buffer 4.1.73.Final: https://github.com/netty/netty/tree/netty-4.1.73.Final, Apache 2.0
     netty-codec 4.1.73.Final: https://github.com/netty/netty/tree/netty-4.1.73.Final, Apache 2.0
@@ -317,7 +333,27 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     opentelemetry-sdk-metrics 1.3.0-alpha: https://github.com/open-telemetry/opentelemetry-java, Apache 2.0
     opentelemetry-sdk-trace 1.3.0: https://github.com/open-telemetry/opentelemetry-java, Apache 2.0
     opentelemetry-semconv 1.3.0-alpha: https://github.com/open-telemetry/opentelemetry-java, Apache 2.0
+    perfmark-api 0.23.0: https://github.com/perfmark/perfmark, Apache 2.0
+    pinpoint-annotations 2.4.1: https://github.com/pinpoint-apm/pinpoint, Apache 2.0
+    pinpoint-bootstrap 2.4.1: https://github.com/pinpoint-apm/pinpoint, Apache 2.0
+    pinpoint-bootstrap-core 2.4.1: https://github.com/pinpoint-apm/pinpoint, Apache 2.0
+    pinpoint-commons 2.4.1: https://github.com/pinpoint-apm/pinpoint, Apache 2.0
+    pinpoint-commons-buffer 2.4.1: https://github.com/pinpoint-apm/pinpoint, Apache 2.0
+    pinpoint-commons-profiler 2.4.1: https://github.com/pinpoint-apm/pinpoint, Apache 2.0
+    pinpoint-grpc 2.4.1: https://github.com/pinpoint-apm/pinpoint, Apache 2.0
+    pinpoint-profiler 2.4.1: https://github.com/pinpoint-apm/pinpoint, Apache 2.0
+    pinpoint-rpc 2.4.1: https://github.com/pinpoint-apm/pinpoint, Apache 2.0
+    pravega-client 0.11.0: https://github.com/pravega/pravega, Apache 2.0
+    pravega-common 0.11.0: https://github.com/pravega/pravega, Apache 2.0
+    pravega-shared-authplugin 0.11.0: https://github.com/pravega/pravega, Apache 2.0
+    pravega-shared-controller-api 0.11.0: https://github.com/pravega/pravega, Apache 2.0
+    pravega-shared-protocol 0.11.0: https://github.com/pravega/pravega, Apache 2.0
+    pravega-shared-security 0.11.0: https://github.com/pravega/pravega, Apache 2.0
     proto-google-common-protos 1.0.0: https://github.com/googleapis/common-protos-java, Apache 2.0
+    pulsar-client 2.10.1: https://github.com/apache/pulsar, Apache 2.0
+    pulsar-client-admin-api 2.10.1: https://github.com/apache/pulsar, Apache 2.0
+    pulsar-client-api 2.10.1: https://github.com/apache/pulsar, Apache 2.0
+    reactor-core-3.4.13.jar: https://github.com/reactor/reactor-core, Apache 2.0
     rocketmq-acl 4.9.3: https://github.com/apache/rocketmq, Apache 2.0
     rocketmq-broker 4.9.3: https://github.com/apache/rocketmq, Apache 2.0
     rocketmq-client 4.9.3: https://github.com/apache/rocketmq, Apache 2.0
@@ -335,12 +371,11 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     simpleclient_httpserver 0.8.1: https://github.com/prometheus/client_java, Apache 2.0
     snakeyaml 1.30: https://bitbucket.org/asomov/snakeyaml, Apache 2.0
     truth 0.30: https://github.com/google/truth, Apache 2.0
+    validation-api 1.1.0.Final: https://github.com/jakartaee/validation, Apache 2.0
     zipkin 2.23.2: https://github.com/openzipkin/zipkin, Apache 2.0
     zipkin-reporter 2.16.3: https://github.com/openzipkin/zipkin-reporter-java, Apache 2.0
     zipkin-sender-okhttp3 2.16.3: https://github.com/openzipkin/zipkin-reporter-java, Apache 2.0
-    bcpkix-jdk15on 1.69: https://github.com/bcgit/bc-java, Apache 2.0
-    bcprov-jdk15on 1.69: https://github.com/bcgit/bc-java, Apache 2.0
-    bcutil-jdk15on 1.69: https://github.com/bcgit/bc-java, Apache 2.0
+    zookeeper 3.4.6: https://github.com/apache/zookeeper, Apache 2.0
     cloud.google.com/go v0.34.0 Apache-2.0
     github.com/OneOfOne/xxhash v1.2.2 Apache-2.0
     github.com/census-instrumentation/opencensus-proto v0.2.1 Apache-2.0
@@ -381,6 +416,8 @@ The following components are provided under the CDDL License. See project link f
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
     javax.annotation-api 1.3.2: https://github.com/javaee/javax.annotation , CDDL1.1
+    javax.activation 1.2.0: https://github.com/javaee/activation, CDDL1.1
+    javax.ws.rs-api 2.1: https://github.com/javaee/jax-rs-api, CDDL1.1
 
 ========================================================================
 CPL licenses
@@ -412,6 +449,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     bcprov-jdk15on 1.69: https://github.com/bcgit/bc-java, MIT
     bcutil-jdk15on 1.69: https://github.com/bcgit/bc-java, MIT
     checker-qual 3.12.0: https://github.com/typetools/checker-framework, MIT
+    reactive-streams 1.0.3: https://github.com/reactive-streams/reactive-streams-jvm, MIT
     slf4j-api 1.7.30: https://github.com/qos-ch/slf4j, MIT
     github.com/BurntSushi/toml v0.3.1 MIT
     github.com/antihax/optional v1.0.0 MIT
@@ -442,6 +480,7 @@ BSD-3-Clause licenses
 The following components are provided under the BSD-3-Clause License. See project link for details.
 The text of each license is also included at licenses/license-[project].txt.
 
+    jline 0.9.94: https://github.com/jline, BSD-3-Clause
     github.com/golang/protobuf v1.5.2 BSD-3-Clause
     github.com/google/go-cmp v0.5.5 BSD-3-Clause
     github.com/google/uuid v1.3.0 BSD-3-Clause
@@ -476,6 +515,8 @@ BSD-2-Clause licenses
 The following components are provided under the BSD-2-Clause License. See project link for details.
 The text of each license is also included at licenses/license-[project].txt.
 
+    jodd-bean 5.1.6: https://github.com/oblac/jodd-util, BSD-2-Clause
+    jodd-core 5.1.6: https://github.com/oblac/jodd, BSD-2-Clause
     github.com/pkg/errors v0.9.1 BSD-2-Clause
     gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f BSD-2-Clause
 
@@ -487,3 +528,12 @@ The following components are provided under the MIT and Apache License. See proj
 The text of each license is also included at licenses/license-[project].txt.
 
     gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c MIT and Apache
+
+========================================================================
+MPL & GPL & Apache licenses
+========================================================================
+
+The following components are provided under the MPL & GPL & Apache License. See project link for details.
+The text of each license is also included at licenses/license-[project].txt.
+
+    amqp-client 5.16.0: https://github.com/rabbitmq/rabbitmq-java-client MPL & GPL & Apache License
diff --git a/tools/third-party-licenses/licenses/java/LICENSE-amqp-client.txt b/tools/third-party-licenses/licenses/java/LICENSE-amqp-client.txt
@@ -0,0 +1,15 @@
+This package, the RabbitMQ Java client library, is triple-licensed under
+the Mozilla Public License 2.0 ("MPL"), the GNU General Public License
+version 2 ("GPL") and the Apache License version 2 ("ASL"). For the MPL,
+please see LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2.
+For the ASL, please see LICENSE-APACHE2.
+
+This means that you may choose one of these licenses when including or
+using this software in your own.
+
+The RabbitMQ Java client library includes third-party software under the
+ASL. For this license, please see LICENSE-APACHE2. For attribution of
+copyright and other details of provenance, please refer to the source code.
+
+If you have any questions regarding licensing, please contact us at
+info@rabbitmq.com.