Skip to content

Commit 9fddde8

Browse files
committed
Made util classes final with private constructor
1 parent e2857ad commit 9fddde8

26 files changed

+130
-117
lines changed

src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttAuthHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,4 @@
2626
public interface MqttAuthHandler extends ChannelHandler {
2727

2828
@NotNull String NAME = "auth";
29-
3029
}

src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,4 @@ public void request(final long n) {
8080
public void cancel() {
8181
subscriber = null;
8282
}
83-
8483
}

src/main/java/com/hivemq/client/internal/mqtt/message/MqttProperty.java

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,35 @@
2222
*
2323
* @author Silvio Giebl
2424
*/
25-
public interface MqttProperty {
25+
public final class MqttProperty {
2626

27-
int PAYLOAD_FORMAT_INDICATOR = 0x01;
28-
int MESSAGE_EXPIRY_INTERVAL = 0x02;
29-
int CONTENT_TYPE = 0x03;
30-
int RESPONSE_TOPIC = 0x08;
31-
int CORRELATION_DATA = 0x09;
32-
int SUBSCRIPTION_IDENTIFIER = 0x0B;
33-
int SESSION_EXPIRY_INTERVAL = 0x11;
34-
int ASSIGNED_CLIENT_IDENTIFIER = 0x12;
35-
int SERVER_KEEP_ALIVE = 0x13;
36-
int AUTHENTICATION_METHOD = 0x15;
37-
int AUTHENTICATION_DATA = 0x16;
38-
int REQUEST_PROBLEM_INFORMATION = 0x17;
39-
int WILL_DELAY_INTERVAL = 0x18;
40-
int REQUEST_RESPONSE_INFORMATION = 0x19;
41-
int RESPONSE_INFORMATION = 0x1A;
42-
int SERVER_REFERENCE = 0x1C;
43-
int REASON_STRING = 0x1F;
44-
int RECEIVE_MAXIMUM = 0x21;
45-
int TOPIC_ALIAS_MAXIMUM = 0x22;
46-
int TOPIC_ALIAS = 0x23;
47-
int MAXIMUM_QOS = 0x24;
48-
int RETAIN_AVAILABLE = 0x25;
49-
int USER_PROPERTY = 0x26;
50-
int MAXIMUM_PACKET_SIZE = 0x27;
51-
int WILDCARD_SUBSCRIPTION_AVAILABLE = 0x28;
52-
int SUBSCRIPTION_IDENTIFIERS_AVAILABLE = 0x29;
53-
int SHARED_SUBSCRIPTION_AVAILABLE = 0x2A;
27+
public static final int PAYLOAD_FORMAT_INDICATOR = 0x01;
28+
public static final int MESSAGE_EXPIRY_INTERVAL = 0x02;
29+
public static final int CONTENT_TYPE = 0x03;
30+
public static final int RESPONSE_TOPIC = 0x08;
31+
public static final int CORRELATION_DATA = 0x09;
32+
public static final int SUBSCRIPTION_IDENTIFIER = 0x0B;
33+
public static final int SESSION_EXPIRY_INTERVAL = 0x11;
34+
public static final int ASSIGNED_CLIENT_IDENTIFIER = 0x12;
35+
public static final int SERVER_KEEP_ALIVE = 0x13;
36+
public static final int AUTHENTICATION_METHOD = 0x15;
37+
public static final int AUTHENTICATION_DATA = 0x16;
38+
public static final int REQUEST_PROBLEM_INFORMATION = 0x17;
39+
public static final int WILL_DELAY_INTERVAL = 0x18;
40+
public static final int REQUEST_RESPONSE_INFORMATION = 0x19;
41+
public static final int RESPONSE_INFORMATION = 0x1A;
42+
public static final int SERVER_REFERENCE = 0x1C;
43+
public static final int REASON_STRING = 0x1F;
44+
public static final int RECEIVE_MAXIMUM = 0x21;
45+
public static final int TOPIC_ALIAS_MAXIMUM = 0x22;
46+
public static final int TOPIC_ALIAS = 0x23;
47+
public static final int MAXIMUM_QOS = 0x24;
48+
public static final int RETAIN_AVAILABLE = 0x25;
49+
public static final int USER_PROPERTY = 0x26;
50+
public static final int MAXIMUM_PACKET_SIZE = 0x27;
51+
public static final int WILDCARD_SUBSCRIPTION_AVAILABLE = 0x28;
52+
public static final int SUBSCRIPTION_IDENTIFIERS_AVAILABLE = 0x29;
53+
public static final int SHARED_SUBSCRIPTION_AVAILABLE = 0x2A;
5454

55+
private MqttProperty() {}
5556
}

src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthProperty.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
*
2525
* @author Silvio Giebl
2626
*/
27-
public interface MqttAuthProperty {
27+
public final class MqttAuthProperty {
2828

29-
int AUTHENTICATION_METHOD = MqttProperty.AUTHENTICATION_METHOD;
30-
int AUTHENTICATION_DATA = MqttProperty.AUTHENTICATION_DATA;
31-
int REASON_STRING = MqttProperty.REASON_STRING;
32-
int USER_PROPERTY = MqttProperty.USER_PROPERTY;
29+
public static final int AUTHENTICATION_METHOD = MqttProperty.AUTHENTICATION_METHOD;
30+
public static final int AUTHENTICATION_DATA = MqttProperty.AUTHENTICATION_DATA;
31+
public static final int REASON_STRING = MqttProperty.REASON_STRING;
32+
public static final int USER_PROPERTY = MqttProperty.USER_PROPERTY;
3333

34+
private MqttAuthProperty() {}
3435
}

src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectProperty.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,17 @@
2424
*
2525
* @author Silvio Giebl
2626
*/
27-
public interface MqttConnectProperty {
27+
public final class MqttConnectProperty {
2828

29-
int SESSION_EXPIRY_INTERVAL = MqttProperty.SESSION_EXPIRY_INTERVAL;
30-
int AUTHENTICATION_METHOD = MqttProperty.AUTHENTICATION_METHOD;
31-
int AUTHENTICATION_DATA = MqttProperty.AUTHENTICATION_DATA;
32-
int REQUEST_PROBLEM_INFORMATION = MqttProperty.REQUEST_PROBLEM_INFORMATION;
33-
int REQUEST_RESPONSE_INFORMATION = MqttProperty.REQUEST_RESPONSE_INFORMATION;
34-
int RECEIVE_MAXIMUM = MqttProperty.RECEIVE_MAXIMUM;
35-
int TOPIC_ALIAS_MAXIMUM = MqttProperty.TOPIC_ALIAS_MAXIMUM;
36-
int USER_PROPERTY = MqttProperty.USER_PROPERTY;
37-
int MAXIMUM_PACKET_SIZE = MqttProperty.MAXIMUM_PACKET_SIZE;
29+
public static final int SESSION_EXPIRY_INTERVAL = MqttProperty.SESSION_EXPIRY_INTERVAL;
30+
public static final int AUTHENTICATION_METHOD = MqttProperty.AUTHENTICATION_METHOD;
31+
public static final int AUTHENTICATION_DATA = MqttProperty.AUTHENTICATION_DATA;
32+
public static final int REQUEST_PROBLEM_INFORMATION = MqttProperty.REQUEST_PROBLEM_INFORMATION;
33+
public static final int REQUEST_RESPONSE_INFORMATION = MqttProperty.REQUEST_RESPONSE_INFORMATION;
34+
public static final int RECEIVE_MAXIMUM = MqttProperty.RECEIVE_MAXIMUM;
35+
public static final int TOPIC_ALIAS_MAXIMUM = MqttProperty.TOPIC_ALIAS_MAXIMUM;
36+
public static final int USER_PROPERTY = MqttProperty.USER_PROPERTY;
37+
public static final int MAXIMUM_PACKET_SIZE = MqttProperty.MAXIMUM_PACKET_SIZE;
3838

39+
private MqttConnectProperty() {}
3940
}

src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckProperty.java

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,25 @@
2424
*
2525
* @author Silvio Giebl
2626
*/
27-
public interface MqttConnAckProperty {
27+
public final class MqttConnAckProperty {
2828

29-
int SESSION_EXPIRY_INTERVAL = MqttProperty.SESSION_EXPIRY_INTERVAL;
30-
int ASSIGNED_CLIENT_IDENTIFIER = MqttProperty.ASSIGNED_CLIENT_IDENTIFIER;
31-
int SERVER_KEEP_ALIVE = MqttProperty.SERVER_KEEP_ALIVE;
32-
int AUTHENTICATION_METHOD = MqttProperty.AUTHENTICATION_METHOD;
33-
int AUTHENTICATION_DATA = MqttProperty.AUTHENTICATION_DATA;
34-
int RESPONSE_INFORMATION = MqttProperty.RESPONSE_INFORMATION;
35-
int SERVER_REFERENCE = MqttProperty.SERVER_REFERENCE;
36-
int REASON_STRING = MqttProperty.REASON_STRING;
37-
int RECEIVE_MAXIMUM = MqttProperty.RECEIVE_MAXIMUM;
38-
int TOPIC_ALIAS_MAXIMUM = MqttProperty.TOPIC_ALIAS_MAXIMUM;
39-
int MAXIMUM_QOS = MqttProperty.MAXIMUM_QOS;
40-
int RETAIN_AVAILABLE = MqttProperty.RETAIN_AVAILABLE;
41-
int USER_PROPERTY = MqttProperty.USER_PROPERTY;
42-
int MAXIMUM_PACKET_SIZE = MqttProperty.MAXIMUM_PACKET_SIZE;
43-
int WILDCARD_SUBSCRIPTION_AVAILABLE = MqttProperty.WILDCARD_SUBSCRIPTION_AVAILABLE;
44-
int SUBSCRIPTION_IDENTIFIERS_AVAILABLE = MqttProperty.SUBSCRIPTION_IDENTIFIERS_AVAILABLE;
45-
int SHARED_SUBSCRIPTION_AVAILABLE = MqttProperty.SHARED_SUBSCRIPTION_AVAILABLE;
29+
public static final int SESSION_EXPIRY_INTERVAL = MqttProperty.SESSION_EXPIRY_INTERVAL;
30+
public static final int ASSIGNED_CLIENT_IDENTIFIER = MqttProperty.ASSIGNED_CLIENT_IDENTIFIER;
31+
public static final int SERVER_KEEP_ALIVE = MqttProperty.SERVER_KEEP_ALIVE;
32+
public static final int AUTHENTICATION_METHOD = MqttProperty.AUTHENTICATION_METHOD;
33+
public static final int AUTHENTICATION_DATA = MqttProperty.AUTHENTICATION_DATA;
34+
public static final int RESPONSE_INFORMATION = MqttProperty.RESPONSE_INFORMATION;
35+
public static final int SERVER_REFERENCE = MqttProperty.SERVER_REFERENCE;
36+
public static final int REASON_STRING = MqttProperty.REASON_STRING;
37+
public static final int RECEIVE_MAXIMUM = MqttProperty.RECEIVE_MAXIMUM;
38+
public static final int TOPIC_ALIAS_MAXIMUM = MqttProperty.TOPIC_ALIAS_MAXIMUM;
39+
public static final int MAXIMUM_QOS = MqttProperty.MAXIMUM_QOS;
40+
public static final int RETAIN_AVAILABLE = MqttProperty.RETAIN_AVAILABLE;
41+
public static final int USER_PROPERTY = MqttProperty.USER_PROPERTY;
42+
public static final int MAXIMUM_PACKET_SIZE = MqttProperty.MAXIMUM_PACKET_SIZE;
43+
public static final int WILDCARD_SUBSCRIPTION_AVAILABLE = MqttProperty.WILDCARD_SUBSCRIPTION_AVAILABLE;
44+
public static final int SUBSCRIPTION_IDENTIFIERS_AVAILABLE = MqttProperty.SUBSCRIPTION_IDENTIFIERS_AVAILABLE;
45+
public static final int SHARED_SUBSCRIPTION_AVAILABLE = MqttProperty.SHARED_SUBSCRIPTION_AVAILABLE;
4646

47+
private MqttConnAckProperty() {}
4748
}

src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectProperty.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
*
2525
* @author Silvio Giebl
2626
*/
27-
public interface MqttDisconnectProperty {
27+
public final class MqttDisconnectProperty {
2828

29-
int SESSION_EXPIRY_INTERVAL = MqttProperty.SESSION_EXPIRY_INTERVAL;
30-
int SERVER_REFERENCE = MqttProperty.SERVER_REFERENCE;
31-
int REASON_STRING = MqttProperty.REASON_STRING;
32-
int USER_PROPERTY = MqttProperty.USER_PROPERTY;
29+
public static final int SESSION_EXPIRY_INTERVAL = MqttProperty.SESSION_EXPIRY_INTERVAL;
30+
public static final int SERVER_REFERENCE = MqttProperty.SERVER_REFERENCE;
31+
public static final int REASON_STRING = MqttProperty.REASON_STRING;
32+
public static final int USER_PROPERTY = MqttProperty.USER_PROPERTY;
3333

34+
private MqttDisconnectProperty() {}
3435
}

src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishProperty.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@
2424
*
2525
* @author Silvio Giebl
2626
*/
27-
public interface MqttPublishProperty {
27+
public final class MqttPublishProperty {
2828

29-
int PAYLOAD_FORMAT_INDICATOR = MqttProperty.PAYLOAD_FORMAT_INDICATOR;
30-
int MESSAGE_EXPIRY_INTERVAL = MqttProperty.MESSAGE_EXPIRY_INTERVAL;
31-
int CORRELATION_DATA = MqttProperty.CORRELATION_DATA;
32-
int CONTENT_TYPE = MqttProperty.CONTENT_TYPE;
33-
int RESPONSE_TOPIC = MqttProperty.RESPONSE_TOPIC;
34-
int SUBSCRIPTION_IDENTIFIER = MqttProperty.SUBSCRIPTION_IDENTIFIER;
35-
int TOPIC_ALIAS = MqttProperty.TOPIC_ALIAS;
36-
int USER_PROPERTY = MqttProperty.USER_PROPERTY;
29+
public static final int PAYLOAD_FORMAT_INDICATOR = MqttProperty.PAYLOAD_FORMAT_INDICATOR;
30+
public static final int MESSAGE_EXPIRY_INTERVAL = MqttProperty.MESSAGE_EXPIRY_INTERVAL;
31+
public static final int CORRELATION_DATA = MqttProperty.CORRELATION_DATA;
32+
public static final int CONTENT_TYPE = MqttProperty.CONTENT_TYPE;
33+
public static final int RESPONSE_TOPIC = MqttProperty.RESPONSE_TOPIC;
34+
public static final int SUBSCRIPTION_IDENTIFIER = MqttProperty.SUBSCRIPTION_IDENTIFIER;
35+
public static final int TOPIC_ALIAS = MqttProperty.TOPIC_ALIAS;
36+
public static final int USER_PROPERTY = MqttProperty.USER_PROPERTY;
3737

38+
private MqttPublishProperty() {}
3839
}

src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublishProperty.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@
2424
*
2525
* @author Silvio Giebl
2626
*/
27-
public interface MqttWillPublishProperty {
27+
public final class MqttWillPublishProperty {
2828

29-
int PAYLOAD_FORMAT_INDICATOR = MqttProperty.PAYLOAD_FORMAT_INDICATOR;
30-
int MESSAGE_EXPIRY_INTERVAL = MqttProperty.MESSAGE_EXPIRY_INTERVAL;
31-
int CORRELATION_DATA = MqttProperty.CORRELATION_DATA;
32-
int CONTENT_TYPE = MqttProperty.CONTENT_TYPE;
33-
int RESPONSE_TOPIC = MqttProperty.RESPONSE_TOPIC;
34-
int WILL_DELAY_INTERVAL = MqttProperty.WILL_DELAY_INTERVAL;
35-
int USER_PROPERTY = MqttProperty.USER_PROPERTY;
29+
public static final int PAYLOAD_FORMAT_INDICATOR = MqttProperty.PAYLOAD_FORMAT_INDICATOR;
30+
public static final int MESSAGE_EXPIRY_INTERVAL = MqttProperty.MESSAGE_EXPIRY_INTERVAL;
31+
public static final int CORRELATION_DATA = MqttProperty.CORRELATION_DATA;
32+
public static final int CONTENT_TYPE = MqttProperty.CONTENT_TYPE;
33+
public static final int RESPONSE_TOPIC = MqttProperty.RESPONSE_TOPIC;
34+
public static final int WILL_DELAY_INTERVAL = MqttProperty.WILL_DELAY_INTERVAL;
35+
public static final int USER_PROPERTY = MqttProperty.USER_PROPERTY;
3636

37+
private MqttWillPublishProperty() {}
3738
}

src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAckProperty.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@
2424
*
2525
* @author Silvio Giebl
2626
*/
27-
public interface MqttPubAckProperty {
27+
public final class MqttPubAckProperty {
2828

29-
int REASON_STRING = MqttProperty.REASON_STRING;
30-
int USER_PROPERTY = MqttProperty.USER_PROPERTY;
29+
public static final int REASON_STRING = MqttProperty.REASON_STRING;
30+
public static final int USER_PROPERTY = MqttProperty.USER_PROPERTY;
3131

32+
private MqttPubAckProperty() {}
3233
}

0 commit comments

Comments
 (0)