Skip to content

Commit 16b0f7a

Browse files
JavaSaBrJavaSaBr
committed
move config
1 parent 2a416e2 commit 16b0f7a

File tree

2 files changed

+28
-27
lines changed

2 files changed

+28
-27
lines changed

‎legacy/src/main/java/javasabr/mqtt/legacy/config/MqttNetworkConfig.java‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
import javasabr.mqtt.legacy.handler.client.MqttClientReleaseHandler;
44
import javasabr.mqtt.legacy.handler.packet.in.PacketInHandler;
5-
import javasabr.mqtt.legacy.model.MqttPropertyConstants;
6-
import javasabr.mqtt.legacy.model.QoS;
5+
import javasabr.mqtt.model.MqttProperties;
6+
import javasabr.mqtt.model.QoS;
77
import javasabr.mqtt.legacy.network.MqttConnection;
88
import javasabr.mqtt.legacy.network.client.ExternalMqttClient;
99
import javasabr.mqtt.legacy.network.client.InternalMqttClient;
10-
import javasabr.mqtt.legacy.network.client.MqttClient.UnsafeMqttClient;
10+
import javasabr.mqtt.model.network.MqttClient.UnsafeMqttClient;
1111
import java.net.InetSocketAddress;
1212
import java.nio.channels.AsynchronousSocketChannel;
1313
import java.util.function.BiFunction;
1414
import java.util.function.Consumer;
15+
import javasabr.mqtt.model.network.connection.MqttConnectionConfig;
1516
import javasabr.rlib.network.BufferAllocator;
1617
import javasabr.rlib.network.Network;
1718
import javasabr.rlib.network.NetworkFactory;
@@ -156,47 +157,47 @@ MqttConnectionConfig externalConnectionConfig() {
156157
env.getProperty(
157158
"mqtt.external.connection.max.packet.size",
158159
int.class,
159-
MqttPropertyConstants.MAXIMUM_PACKET_SIZE_DEFAULT),
160+
MqttProperties.MAXIMUM_PACKET_SIZE_DEFAULT),
160161
env.getProperty(
161162
"mqtt.external.connection.min.keep.alive",
162163
int.class,
163-
MqttPropertyConstants.SERVER_KEEP_ALIVE_DEFAULT),
164+
MqttProperties.SERVER_KEEP_ALIVE_DEFAULT),
164165
env.getProperty(
165166
"mqtt.external.connection.receive.maximum",
166167
int.class,
167-
MqttPropertyConstants.RECEIVE_MAXIMUM_DEFAULT),
168+
MqttProperties.RECEIVE_MAXIMUM_DEFAULT),
168169
env.getProperty(
169170
"mqtt.external.connection.topic.alias.maximum",
170171
int.class,
171-
MqttPropertyConstants.TOPIC_ALIAS_MAXIMUM_DISABLED),
172+
MqttProperties.TOPIC_ALIAS_MAXIMUM_DISABLED),
172173
env.getProperty(
173174
"mqtt.external.connection.default.session.expiration.time",
174175
long.class,
175-
MqttPropertyConstants.SESSION_EXPIRY_INTERVAL_DEFAULT),
176+
MqttProperties.SESSION_EXPIRY_INTERVAL_DEFAULT),
176177
env.getProperty(
177178
"mqtt.external.connection.keep.alive.enabled",
178179
boolean.class,
179-
MqttPropertyConstants.KEEP_ALIVE_ENABLED_DEFAULT),
180+
MqttProperties.KEEP_ALIVE_ENABLED_DEFAULT),
180181
env.getProperty(
181182
"mqtt.external.connection.sessions.enabled",
182183
boolean.class,
183-
MqttPropertyConstants.SESSIONS_ENABLED_DEFAULT),
184+
MqttProperties.SESSIONS_ENABLED_DEFAULT),
184185
env.getProperty(
185186
"mqtt.external.connection.retain.available",
186187
boolean.class,
187-
MqttPropertyConstants.RETAIN_AVAILABLE_DEFAULT),
188+
MqttProperties.RETAIN_AVAILABLE_DEFAULT),
188189
env.getProperty(
189190
"mqtt.external.connection.wildcard.subscription.available",
190191
boolean.class,
191-
MqttPropertyConstants.WILDCARD_SUBSCRIPTION_AVAILABLE_DEFAULT),
192+
MqttProperties.WILDCARD_SUBSCRIPTION_AVAILABLE_DEFAULT),
192193
env.getProperty(
193194
"mqtt.external.connection.subscription.id.available",
194195
boolean.class,
195-
MqttPropertyConstants.SUBSCRIPTION_IDENTIFIER_AVAILABLE_DEFAULT),
196+
MqttProperties.SUBSCRIPTION_IDENTIFIER_AVAILABLE_DEFAULT),
196197
env.getProperty(
197198
"mqtt.external.connection.shared.subscription.available",
198199
boolean.class,
199-
MqttPropertyConstants.SHARED_SUBSCRIPTION_AVAILABLE_DEFAULT));
200+
MqttProperties.SHARED_SUBSCRIPTION_AVAILABLE_DEFAULT));
200201
}
201202

202203
@Bean
@@ -206,47 +207,47 @@ MqttConnectionConfig internalConnectionConfig() {
206207
env.getProperty(
207208
"mqtt.internal.connection.max.packet.size",
208209
int.class,
209-
MqttPropertyConstants.MAXIMUM_PACKET_SIZE_DEFAULT),
210+
MqttProperties.MAXIMUM_PACKET_SIZE_DEFAULT),
210211
env.getProperty(
211212
"mqtt.internal.connection.min.keep.alive",
212213
int.class,
213-
MqttPropertyConstants.SERVER_KEEP_ALIVE_DEFAULT),
214+
MqttProperties.SERVER_KEEP_ALIVE_DEFAULT),
214215
env.getProperty(
215216
"mqtt.internal.connection.receive.maximum",
216217
int.class,
217-
MqttPropertyConstants.RECEIVE_MAXIMUM_DEFAULT),
218+
MqttProperties.RECEIVE_MAXIMUM_DEFAULT),
218219
env.getProperty(
219220
"mqtt.internal.connection.topic.alias.maximum",
220221
int.class,
221-
MqttPropertyConstants.TOPIC_ALIAS_MAXIMUM_DISABLED),
222+
MqttProperties.TOPIC_ALIAS_MAXIMUM_DISABLED),
222223
env.getProperty(
223224
"mqtt.internal.connection.default.session.expiration.time",
224225
long.class,
225-
MqttPropertyConstants.SESSION_EXPIRY_INTERVAL_DEFAULT),
226+
MqttProperties.SESSION_EXPIRY_INTERVAL_DEFAULT),
226227
env.getProperty(
227228
"mqtt.internal.connection.keep.alive.enabled",
228229
boolean.class,
229-
MqttPropertyConstants.KEEP_ALIVE_ENABLED_DEFAULT),
230+
MqttProperties.KEEP_ALIVE_ENABLED_DEFAULT),
230231
env.getProperty(
231232
"mqtt.internal.connection.sessions.enabled",
232233
boolean.class,
233-
MqttPropertyConstants.SESSIONS_ENABLED_DEFAULT),
234+
MqttProperties.SESSIONS_ENABLED_DEFAULT),
234235
env.getProperty(
235236
"mqtt.internal.connection.retain.available",
236237
boolean.class,
237-
MqttPropertyConstants.RETAIN_AVAILABLE_DEFAULT),
238+
MqttProperties.RETAIN_AVAILABLE_DEFAULT),
238239
env.getProperty(
239240
"mqtt.internal.connection.wildcard.subscription.available",
240241
boolean.class,
241-
MqttPropertyConstants.WILDCARD_SUBSCRIPTION_AVAILABLE_DEFAULT),
242+
MqttProperties.WILDCARD_SUBSCRIPTION_AVAILABLE_DEFAULT),
242243
env.getProperty(
243244
"mqtt.internal.connection.subscription.id.available",
244245
boolean.class,
245-
MqttPropertyConstants.SUBSCRIPTION_IDENTIFIER_AVAILABLE_DEFAULT),
246+
MqttProperties.SUBSCRIPTION_IDENTIFIER_AVAILABLE_DEFAULT),
246247
env.getProperty(
247248
"mqtt.internal.connection.shared.subscription.available",
248249
boolean.class,
249-
MqttPropertyConstants.SHARED_SUBSCRIPTION_AVAILABLE_DEFAULT));
250+
MqttProperties.SHARED_SUBSCRIPTION_AVAILABLE_DEFAULT));
250251
}
251252

252253
private ChannelFactory externalConnectionFactory(

‎legacy/src/main/java/javasabr/mqtt/legacy/config/MqttConnectionConfig.java‎ renamed to ‎model/src/main/java/javasabr/mqtt/model/network/connection/MqttConnectionConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package javasabr.mqtt.legacy.config;
1+
package javasabr.mqtt.model.network.connection;
22

3-
import javasabr.mqtt.legacy.model.QoS;
3+
import javasabr.mqtt.model.QoS;
44
import lombok.Getter;
55
import lombok.RequiredArgsConstructor;
66

0 commit comments

Comments
 (0)