Skip to content

Commit 169386c

Browse files
author
ZhangJian He
authored
feat: add reactor module (#23)
Signed-off-by: ZhangJian He <[email protected]>
1 parent 6525edb commit 169386c

File tree

12 files changed

+140
-23
lines changed

12 files changed

+140
-23
lines changed

‎ci/spotbugs/exclude.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,12 @@
1515
<Bug pattern="EI_EXPOSE_REP2"/>
1616
</Match>
1717

18+
<Match>
19+
<Bug pattern="PA_PUBLIC_PRIMITIVE_ATTRIBUTE"/>
20+
</Match>
21+
22+
<Match>
23+
<Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD"/>
24+
</Match>
25+
1826
</FindBugsFilter>

‎pom.xml‎

Lines changed: 44 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66

77
<groupId>io.github.protocol-laboratory</groupId>
88
<artifactId>pulsar-admin-parent</artifactId>
9-
<version>0.0.1</version>
9+
<version>0.0.2</version>
1010
<packaging>pom</packaging>
1111

1212
<modules>
13+
<module>pulsar-admin-api</module>
1314
<module>pulsar-admin-jdk</module>
15+
<module>pulsar-admin-reactor</module>
1416
</modules>
1517

1618
<properties>
@@ -25,19 +27,22 @@
2527
<junit.version>5.11.0</junit.version>
2628
<log4j.version>2.20.0</log4j.version>
2729
<lombok.version>1.18.34</lombok.version>
30+
<puppycrawl.version>10.18.0</puppycrawl.version>
31+
<reactor-netty.version>1.1.22</reactor-netty.version>
2832
<!-- plugin -->
29-
<compiler-plugin.version>3.10.1</compiler-plugin.version>
30-
<checkstyle-plugin.version>3.2.0</checkstyle-plugin.version>
31-
<javadoc-plugin.version>3.4.1</javadoc-plugin.version>
3233
<lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
33-
<maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
34-
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
35-
<puppycrawl.version>10.18.0</puppycrawl.version>
36-
<release-plugin.version>3.0.0-M6</release-plugin.version>
37-
<scm-provider-gitexe.version>2.1.0</scm-provider-gitexe.version>
38-
<source-plugin.version>3.2.1</source-plugin.version>
39-
<spotbugs-maven-plugin.version>4.7.2.0</spotbugs-maven-plugin.version>
40-
<surefire-plugin.version>3.0.0-M9</surefire-plugin.version>
34+
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
35+
<maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
36+
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
37+
<maven-enforce-plugin-maven.version>3.8.0</maven-enforce-plugin-maven.version>
38+
<maven-gpg-plugin.version>3.2.5</maven-gpg-plugin.version>
39+
<maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
40+
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
41+
<maven-scm-provider-gitexe.version>2.1.0</maven-scm-provider-gitexe.version>
42+
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
43+
<maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
44+
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
45+
<spotbugs-maven-plugin.version>4.8.6.2</spotbugs-maven-plugin.version>
4146
<spotless-maven-plugi.version>2.43.0</spotless-maven-plugi.version>
4247
</properties>
4348

@@ -92,10 +97,30 @@
9297
<build>
9398
<sourceDirectory>${src.dir}</sourceDirectory>
9499
<plugins>
100+
<plugin>
101+
<groupId>org.apache.maven.plugins</groupId>
102+
<artifactId>maven-enforcer-plugin</artifactId>
103+
<version>${maven-enforcer-plugin.version}</version>
104+
<executions>
105+
<execution>
106+
<id>enforce-versions</id>
107+
<goals>
108+
<goal>enforce</goal>
109+
</goals>
110+
<configuration>
111+
<rules>
112+
<requireMavenVersion>
113+
<version>${maven-enforce-plugin-maven.version}</version>
114+
</requireMavenVersion>
115+
</rules>
116+
</configuration>
117+
</execution>
118+
</executions>
119+
</plugin>
95120
<plugin>
96121
<groupId>org.apache.maven.plugins</groupId>
97122
<artifactId>maven-compiler-plugin</artifactId>
98-
<version>${compiler-plugin.version}</version>
123+
<version>${maven-compiler-plugin.version}</version>
99124
<configuration>
100125
<source>${maven.compiler.source}</source>
101126
<target>${maven.compiler.target}</target>
@@ -104,7 +129,7 @@
104129
<plugin>
105130
<groupId>org.apache.maven.plugins</groupId>
106131
<artifactId>maven-checkstyle-plugin</artifactId>
107-
<version>${checkstyle-plugin.version}</version>
132+
<version>${maven-checkstyle-plugin.version}</version>
108133
<dependencies>
109134
<dependency>
110135
<groupId>com.puppycrawl.tools</groupId>
@@ -141,7 +166,7 @@
141166
<plugin>
142167
<groupId>org.apache.maven.plugins</groupId>
143168
<artifactId>maven-surefire-plugin</artifactId>
144-
<version>${surefire-plugin.version}</version>
169+
<version>${maven-surefire-plugin.version}</version>
145170
<extensions>true</extensions>
146171
<configuration>
147172
<useFile>false</useFile>
@@ -169,7 +194,7 @@
169194
<plugin>
170195
<groupId>org.apache.maven.plugins</groupId>
171196
<artifactId>maven-release-plugin</artifactId>
172-
<version>${release-plugin.version}</version>
197+
<version>${maven-release-plugin.version}</version>
173198
<configuration>
174199
<localCheckout>true</localCheckout>
175200
<pushChanges>false</pushChanges>
@@ -180,14 +205,14 @@
180205
<dependency>
181206
<groupId>org.apache.maven.scm</groupId>
182207
<artifactId>maven-scm-provider-gitexe</artifactId>
183-
<version>${scm-provider-gitexe.version}</version>
208+
<version>${maven-scm-provider-gitexe.version}</version>
184209
</dependency>
185210
</dependencies>
186211
</plugin>
187212
<plugin>
188213
<groupId>org.apache.maven.plugins</groupId>
189214
<artifactId>maven-javadoc-plugin</artifactId>
190-
<version>${javadoc-plugin.version}</version>
215+
<version>${maven-javadoc-plugin.version}</version>
191216
<configuration>
192217
<sourcepath>${src.dir}</sourcepath>
193218
<doclint>all,-missing</doclint>
@@ -204,7 +229,7 @@
204229
<plugin>
205230
<groupId>org.apache.maven.plugins</groupId>
206231
<artifactId>maven-source-plugin</artifactId>
207-
<version>${source-plugin.version}</version>
232+
<version>${maven-source-plugin.version}</version>
208233
<executions>
209234
<execution>
210235
<id>attach-sources</id>

‎pulsar-admin-api/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>io.github.protocol-laboratory</groupId>
8+
<artifactId>pulsar-admin-parent</artifactId>
9+
<version>0.0.2</version>
10+
</parent>
11+
12+
<artifactId>pulsar-admin-api</artifactId>
13+
14+
</project>

‎pulsar-admin-api/src/main/java/io/github/protocol/pulsar/admin/api/TlsConfig.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package io.github.protocol.pulsar.admin.api;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.NoArgsConstructor;
5+
import lombok.Setter;
6+
import lombok.ToString;
7+
8+
@Setter
9+
@NoArgsConstructor
10+
@AllArgsConstructor
11+
public class TlsConfig {
12+
public String keyStorePath;
13+
14+
@ToString.Exclude
15+
public char[] keyStorePassword;
16+
17+
public String trustStorePath;
18+
19+
@ToString.Exclude
20+
public char[] trustStorePassword;
21+
22+
public boolean verifyDisabled;
23+
24+
public boolean hostnameVerifyDisabled;
25+
26+
public String[] versions;
27+
28+
public String[] cipherSuites;
29+
}

‎pulsar-admin-api/src/main/java/io/github/protocol/pulsar/admin/api/package-info.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package io.github.protocol.pulsar.admin.api;

‎pulsar-admin-jdk/pom.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,19 @@
66
<parent>
77
<groupId>io.github.protocol-laboratory</groupId>
88
<artifactId>pulsar-admin-parent</artifactId>
9-
<version>0.0.1</version>
9+
<version>0.0.2</version>
1010
</parent>
1111

1212
<artifactId>pulsar-admin-jdk</artifactId>
1313

14+
<dependencies>
15+
<dependency>
16+
<groupId>io.github.protocol-laboratory</groupId>
17+
<artifactId>pulsar-admin-api</artifactId>
18+
<version>${project.version}</version>
19+
</dependency>
20+
</dependencies>
21+
1422
<build>
1523
<testResources>
1624
<testResource>

‎pulsar-admin-jdk/src/main/java/io/github/protocol/pulsar/admin/jdk/Configuration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class Configuration {
2929

3030
private int port;
3131

32-
public boolean useSsl = false;
32+
public boolean tlsEnabled;
3333

3434
public String keyStorePath;
3535

‎pulsar-admin-jdk/src/main/java/io/github/protocol/pulsar/admin/jdk/InnerHttpClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public InnerHttpClient(Configuration conf) {
3939
this.conf = conf;
4040
HttpClient.Builder builder = HttpClient.newBuilder()
4141
.version(HttpClient.Version.HTTP_1_1);
42-
if (conf.isUseSsl()) {
42+
if (conf.isTlsEnabled()) {
4343
builder = builder
4444
.sslContext(SslContextUtil.buildFromJks(conf.keyStorePath, conf.keyStorePassword,
4545
conf.trustStorePath, conf.trustStorePassword, conf.disableSslVerify,

‎pulsar-admin-jdk/src/main/java/io/github/protocol/pulsar/admin/jdk/PulsarAdminBuilderImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public PulsarAdminBuilder port(int port) {
4444

4545
@Override
4646
public PulsarAdminBuilder useSsl(boolean useSsl) {
47-
this.conf.setUseSsl(useSsl);
47+
this.conf.setTlsEnabled(useSsl);
4848
return this;
4949
}
5050

‎pulsar-admin-reactor/pom.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>io.github.protocol-laboratory</groupId>
8+
<artifactId>pulsar-admin-parent</artifactId>
9+
<version>0.0.2</version>
10+
</parent>
11+
12+
<artifactId>pulsar-admin-reactor</artifactId>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>io.github.protocol-laboratory</groupId>
17+
<artifactId>pulsar-admin-api</artifactId>
18+
<version>${project.version}</version>
19+
</dependency>
20+
<dependency>
21+
<groupId>io.projectreactor.netty</groupId>
22+
<artifactId>reactor-netty-http</artifactId>
23+
<version>${reactor-netty.version}</version>
24+
</dependency>
25+
</dependencies>
26+
27+
</project>

0 commit comments

Comments
 (0)