Skip to content

Commit 20a6f2d

Browse files
Technoboy-Technoboy-
committed
Fix compile issue
1 parent 48166d6 commit 20a6f2d

4 files changed

Lines changed: 172 additions & 5 deletions

File tree

‎mqtt-common/pom.xml‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,39 @@
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>pulsar-protocol-handler-mqtt-common</artifactId>
27-
</project>
27+
28+
<dependencies>
29+
<dependency>
30+
<groupId>io.streamnative</groupId>
31+
<artifactId>pulsar-client-original</artifactId>
32+
</dependency>
33+
<dependency>
34+
<groupId>io.streamnative</groupId>
35+
<artifactId>bookkeeper-common</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>com.google.guava</groupId>
39+
<artifactId>guava</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>commons-codec</groupId>
43+
<artifactId>commons-codec</artifactId>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.apache.commons</groupId>
47+
<artifactId>commons-collections4</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>javax.validation</groupId>
51+
<artifactId>validation-api</artifactId>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.github.ben-manes.caffeine</groupId>
55+
<artifactId>caffeine</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.conscrypt</groupId>
59+
<artifactId>conscrypt-openjdk-uber</artifactId>
60+
</dependency>
61+
</dependencies>
62+
</project>

‎mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/MQTTConnectionManager.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.function.Consumer;
3131
import lombok.Getter;
3232
import lombok.extern.slf4j.Slf4j;
33-
import org.apache.pulsar.jetcd.shaded.io.vertx.core.impl.ConcurrentHashSet;
3433

3534
/**
3635
* Proxy connection manager.
@@ -40,7 +39,7 @@ public class MQTTConnectionManager {
4039

4140
private final ConcurrentMap<String, Connection> localConnections;
4241

43-
private final ConcurrentHashSet<String> eventClientIds;
42+
private final Set<String> eventClientIds;
4443

4544
@Getter
4645
private static final HashedWheelTimer sessionExpireInterval =
@@ -58,7 +57,7 @@ public class MQTTConnectionManager {
5857
public MQTTConnectionManager(String advertisedAddress) {
5958
this.advertisedAddress = advertisedAddress;
6059
this.localConnections = new ConcurrentHashMap<>(2048);
61-
this.eventClientIds = new ConcurrentHashSet<>(2048);
60+
this.eventClientIds = ConcurrentHashMap.newKeySet(2048);
6261
this.connectListener = new ConnectEventListener();
6362
this.disconnectListener = new DisconnectEventListener();
6463
}

‎mqtt-proxy/pom.xml‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,46 @@
3232
<artifactId>pulsar-protocol-handler-mqtt-common</artifactId>
3333
<version>${project.version}</version>
3434
</dependency>
35+
<dependency>
36+
<groupId>io.prometheus</groupId>
37+
<artifactId>simpleclient</artifactId>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.eclipse.jetty</groupId>
41+
<artifactId>jetty-server</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.eclipse.jetty.ee8</groupId>
45+
<artifactId>jetty-ee8-servlet</artifactId>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.glassfish.jersey.core</groupId>
49+
<artifactId>jersey-server</artifactId>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.glassfish.jersey.containers</groupId>
53+
<artifactId>jersey-container-servlet-core</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.glassfish.jersey.media</groupId>
57+
<artifactId>jersey-media-multipart</artifactId>
58+
</dependency>
59+
<dependency>
60+
<groupId>io.swagger</groupId>
61+
<artifactId>swagger-annotations</artifactId>
62+
</dependency>
63+
<dependency>
64+
<groupId>javax.ws.rs</groupId>
65+
<artifactId>javax.ws.rs-api</artifactId>
66+
</dependency>
67+
<dependency>
68+
<groupId>javax.servlet</groupId>
69+
<artifactId>javax.servlet-api</artifactId>
70+
</dependency>
71+
<dependency>
72+
<groupId>com.google.protobuf</groupId>
73+
<artifactId>protobuf-java</artifactId>
74+
</dependency>
3575
</dependencies>
3676
<build>
3777
<plugins>
@@ -55,4 +95,4 @@
5595
</plugin>
5696
</plugins>
5797
</build>
58-
</project>
98+
</project>

‎pom.xml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,19 @@
7474
<opentelemetry.version>1.56.0</opentelemetry.version>
7575
<commons-lang3.version>3.19.0</commons-lang3.version>
7676
<slf4j.version>2.0.17</slf4j.version>
77+
<bookkeeper-common.version>4.17.3.1</bookkeeper-common.version>
78+
<commons-codec.version>1.20.0</commons-codec.version>
79+
<commons-collections4.version>4.5.0</commons-collections4.version>
80+
<validation-api.version>2.0.1.Final</validation-api.version>
81+
<caffeine.version>3.2.3</caffeine.version>
82+
<conscrypt.version>2.5.2</conscrypt.version>
83+
<simpleclient.version>0.16.0</simpleclient.version>
84+
<jetty.version>12.1.6</jetty.version>
85+
<jersey.version>2.42</jersey.version>
86+
<swagger-annotations.version>1.6.15</swagger-annotations.version>
87+
<javax.ws.rs.version>2.1.1</javax.ws.rs.version>
88+
<javax.servlet.version>4.0.1</javax.servlet.version>
89+
<protobuf.version>3.25.5</protobuf.version>
7790
</properties>
7891

7992
<dependencies>
@@ -154,6 +167,86 @@
154167
<type>pom</type>
155168
<scope>import</scope>
156169
</dependency>
170+
<dependency>
171+
<groupId>io.streamnative</groupId>
172+
<artifactId>bookkeeper-common</artifactId>
173+
<version>${bookkeeper-common.version}</version>
174+
</dependency>
175+
<dependency>
176+
<groupId>commons-codec</groupId>
177+
<artifactId>commons-codec</artifactId>
178+
<version>${commons-codec.version}</version>
179+
</dependency>
180+
<dependency>
181+
<groupId>org.apache.commons</groupId>
182+
<artifactId>commons-collections4</artifactId>
183+
<version>${commons-collections4.version}</version>
184+
</dependency>
185+
<dependency>
186+
<groupId>javax.validation</groupId>
187+
<artifactId>validation-api</artifactId>
188+
<version>${validation-api.version}</version>
189+
</dependency>
190+
<dependency>
191+
<groupId>com.github.ben-manes.caffeine</groupId>
192+
<artifactId>caffeine</artifactId>
193+
<version>${caffeine.version}</version>
194+
</dependency>
195+
<dependency>
196+
<groupId>org.conscrypt</groupId>
197+
<artifactId>conscrypt-openjdk-uber</artifactId>
198+
<version>${conscrypt.version}</version>
199+
</dependency>
200+
<dependency>
201+
<groupId>io.prometheus</groupId>
202+
<artifactId>simpleclient</artifactId>
203+
<version>${simpleclient.version}</version>
204+
</dependency>
205+
<dependency>
206+
<groupId>org.eclipse.jetty</groupId>
207+
<artifactId>jetty-server</artifactId>
208+
<version>${jetty.version}</version>
209+
</dependency>
210+
<dependency>
211+
<groupId>org.eclipse.jetty.ee8</groupId>
212+
<artifactId>jetty-ee8-servlet</artifactId>
213+
<version>${jetty.version}</version>
214+
</dependency>
215+
<dependency>
216+
<groupId>org.glassfish.jersey.core</groupId>
217+
<artifactId>jersey-server</artifactId>
218+
<version>${jersey.version}</version>
219+
</dependency>
220+
<dependency>
221+
<groupId>org.glassfish.jersey.containers</groupId>
222+
<artifactId>jersey-container-servlet-core</artifactId>
223+
<version>${jersey.version}</version>
224+
</dependency>
225+
<dependency>
226+
<groupId>org.glassfish.jersey.media</groupId>
227+
<artifactId>jersey-media-multipart</artifactId>
228+
<version>${jersey.version}</version>
229+
</dependency>
230+
<dependency>
231+
<groupId>io.swagger</groupId>
232+
<artifactId>swagger-annotations</artifactId>
233+
<version>${swagger-annotations.version}</version>
234+
</dependency>
235+
<dependency>
236+
<groupId>javax.ws.rs</groupId>
237+
<artifactId>javax.ws.rs-api</artifactId>
238+
<version>${javax.ws.rs.version}</version>
239+
</dependency>
240+
<dependency>
241+
<groupId>javax.servlet</groupId>
242+
<artifactId>javax.servlet-api</artifactId>
243+
<version>${javax.servlet.version}</version>
244+
</dependency>
245+
<dependency>
246+
<groupId>com.google.protobuf</groupId>
247+
<artifactId>protobuf-java</artifactId>
248+
<version>${protobuf.version}</version>
249+
</dependency>
157250
</dependencies>
158251
</dependencyManagement>
159252

0 commit comments

Comments
 (0)