diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index a541175f044d2..be97087edb75a 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -272,8 +272,6 @@ The Apache Software License, Version 2.0 * Netty Reactive Streams -- com.typesafe.netty-netty-reactive-streams-2.0.6.jar * Swagger - io.swagger-swagger-annotations-1.6.2.jar - - io.swagger-swagger-core-1.6.2.jar - - io.swagger-swagger-models-1.6.2.jar * DataSketches - com.yahoo.datasketches-memory-0.8.3.jar - com.yahoo.datasketches-sketches-core-0.8.3.jar diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt index 44af676654bcf..185b66f6cb416 100644 --- a/distribution/shell/src/assemble/LICENSE.bin.txt +++ b/distribution/shell/src/assemble/LICENSE.bin.txt @@ -331,10 +331,6 @@ The Apache Software License, Version 2.0 - listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar * J2ObjC Annotations -- j2objc-annotations-1.3.jar * Netty Reactive Streams -- netty-reactive-streams-2.0.6.jar - * Swagger - - swagger-annotations-1.6.2.jar - - swagger-core-1.6.2.jar - - swagger-models-1.6.2.jar * DataSketches - memory-0.8.3.jar - sketches-core-0.8.3.jar diff --git a/pom.xml b/pom.xml index 2892c4ef3f3b6..254609a6f07cb 100644 --- a/pom.xml +++ b/pom.xml @@ -869,12 +869,14 @@ flexible messaging model and an intuitive client API. io.swagger swagger-core ${swagger.version} + provided io.swagger swagger-annotations ${swagger.version} + provided diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CliCommand.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CliCommand.java index c96b0bd4365d2..3d87ce644f226 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CliCommand.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CliCommand.java @@ -90,12 +90,11 @@ static long validateSizeString(String s) { String subStr = s.substring(0, s.length() - 1); long size; try { - size = sizeUnit.contains(last) - ? Long.parseLong(subStr) - : Long.parseLong(s); + size = SIZE_UNIT.contains(last) ? Long.parseLong(subStr) : Long.parseLong(s); } catch (IllegalArgumentException e) { - throw new ParameterException(String.format("Invalid size '%s'. Valid formats are: %s", - s, "(4096, 100K, 10M, 16G, 2T)")); + throw new ParameterException( + String.format("Invalid size '%s'. Valid formats are: %s", + s, "(4096, 100K, 10M, 16G, 2T)")); } switch (last) { case 'k': @@ -223,15 +222,15 @@ void print(T item) { void prettyPrint(T item) { try { - System.out.println(writer.writeValueAsString(item)); + System.out.println(WRITER.writeValueAsString(item)); } catch (Exception e) { throw new RuntimeException(e); } } - private static ObjectMapper mapper = ObjectMapperFactory.create(); - private static ObjectWriter writer = mapper.writerWithDefaultPrettyPrinter(); - private static Set sizeUnit = Sets.newHashSet('k', 'K', 'm', 'M', 'g', 'G', 't', 'T'); + private static final ObjectMapper MAPPER = ObjectMapperFactory.create(); + private static final ObjectWriter WRITER = MAPPER.writerWithDefaultPrettyPrinter(); + private static final Set SIZE_UNIT = Sets.newHashSet('k', 'K', 'm', 'M', 'g', 'G', 't', 'T'); abstract void run() throws Exception; } diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java index 3d18b97060a08..6bd9617c37674 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java @@ -25,7 +25,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.swagger.util.Json; import java.io.IOException; import java.util.Arrays; import java.util.HashSet; @@ -2559,8 +2558,9 @@ private class GetPropertiesForNamespace extends CliCommand { @Override void run() throws Exception { - String namespace = validateNamespace(params); - Json.prettyPrint(getAdmin().namespaces().getProperties(namespace)); + final String namespace = validateNamespace(params); + final Map properties = getAdmin().namespaces().getProperties(namespace); + prettyPrint(properties); } } diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml index 3386fedfe277a..db2297100eeb2 100644 --- a/pulsar-client/pom.xml +++ b/pulsar-client/pom.xml @@ -73,6 +73,11 @@ netty-codec-socks + + io.swagger + swagger-annotations + + io.netty netty-resolver-dns diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 50c2da344f0fd..15f20ae7e4ad6 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -476,8 +476,6 @@ The Apache Software License, Version 2.0 - zookeeper-jute-3.8.1.jar * Apache Yetus Audience Annotations - audience-annotations-0.12.0.jar - * Swagger - - swagger-annotations-1.6.2.jar * Perfmark - perfmark-api-0.19.0.jar * RabbitMQ Java Client diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java index e6ba6acff83c0..db18451a40936 100644 --- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java +++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java @@ -27,7 +27,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import io.swagger.util.Json; import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; @@ -1701,13 +1700,17 @@ private void publishAndConsumeMessages(String inputTopic, Message msg = consumer.receive(30, TimeUnit.SECONDS); if (msg == null) { log.info("Input topic stats: {}", - Json.pretty(pulsarAdmin.topics().getStats(inputTopic, true))); + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString( + pulsarAdmin.topics().getStats(inputTopic, true))); log.info("Output topic stats: {}", - Json.pretty(pulsarAdmin.topics().getStats(outputTopic, true))); + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString( + pulsarAdmin.topics().getStats(outputTopic, true))); log.info("Input topic internal-stats: {}", - Json.pretty(pulsarAdmin.topics().getInternalStats(inputTopic, true))); + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString( + pulsarAdmin.topics().getInternalStats(inputTopic, true))); log.info("Output topic internal-stats: {}", - Json.pretty(pulsarAdmin.topics().getInternalStats(outputTopic, true))); + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString( + pulsarAdmin.topics().getInternalStats(outputTopic, true))); } else { String logMsg = new String(msg.getValue(), UTF_8); log.info("Received message: '{}'", logMsg);