Skip to content

Commit e8ae03f

Browse files
LukasBrandLukasBrand
committed
Aligned package naming
1 parent 574d4db commit e8ae03f

32 files changed

+86
-86
lines changed

‎src/main/java/com/hivemq/extensions/mqtt/message/log/MqttMessageLogExtensionMain.java‎ renamed to ‎src/main/java/com/hivemq/extensions/log/mqtt/MqttMessageLogExtensionMain.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.hivemq.extensions.mqtt.message.log;
16+
package com.hivemq.extensions.log.mqtt;
1717

1818
import com.hivemq.extension.sdk.api.ExtensionMain;
1919
import com.hivemq.extension.sdk.api.annotations.NotNull;
@@ -25,10 +25,10 @@
2525
import com.hivemq.extension.sdk.api.services.Services;
2626
import com.hivemq.extension.sdk.api.services.admin.LicenseEdition;
2727
import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
28-
import com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig;
29-
import com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfigReader;
30-
import com.hivemq.extensions.mqtt.message.log.initializer.ClientInitializerImpl;
31-
import com.hivemq.extensions.mqtt.message.log.initializer.ClientInitializerImpl4_2;
28+
import com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig;
29+
import com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfigReader;
30+
import com.hivemq.extensions.log.mqtt.initializer.ClientInitializerImpl;
31+
import com.hivemq.extensions.log.mqtt.initializer.ClientInitializerImpl4_2;
3232
import org.slf4j.Logger;
3333
import org.slf4j.LoggerFactory;
3434

‎src/main/java/com/hivemq/extensions/mqtt/message/log/config/MqttMessageLogConfig.java‎ renamed to ‎src/main/java/com/hivemq/extensions/log/mqtt/config/MqttMessageLogConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.hivemq.extensions.mqtt.message.log.config;
16+
package com.hivemq.extensions.log.mqtt.config;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
1919

‎src/main/java/com/hivemq/extensions/mqtt/message/log/config/MqttMessageLogConfigReader.java‎ renamed to ‎src/main/java/com/hivemq/extensions/log/mqtt/config/MqttMessageLogConfigReader.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.hivemq.extensions.mqtt.message.log.config;
16+
package com.hivemq.extensions.log.mqtt.config;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
1919
import org.slf4j.Logger;
@@ -24,28 +24,28 @@
2424
import java.io.InputStream;
2525
import java.util.Properties;
2626

27-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.CLIENT_CONNECT;
28-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.CLIENT_DISCONNECT;
29-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.CONNACK_SEND;
30-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.FALSE;
31-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PING_REQ_RECEIVED;
32-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PING_RESP_SEND;
33-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PUBACK_RECEIVED;
34-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PUBACK_SEND;
35-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PUBCOMP_RECEIVED;
36-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PUBCOMP_SEND;
37-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PUBLISH_RECEIVED;
38-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PUBLISH_SEND;
39-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PUBREC_RECEIVED;
40-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PUBREC_SEND;
41-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PUBREL_RECEIVED;
42-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.PUBREL_SEND;
43-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.SUBACK_SEND;
44-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.SUBSCRIBE_RECEIVED;
45-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.TRUE;
46-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.UNSUBACK_SEND;
47-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.UNSUBSCRIBE_RECEIVED;
48-
import static com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig.VERBOSE;
27+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.CLIENT_CONNECT;
28+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.CLIENT_DISCONNECT;
29+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.CONNACK_SEND;
30+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.FALSE;
31+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PING_REQ_RECEIVED;
32+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PING_RESP_SEND;
33+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBACK_RECEIVED;
34+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBACK_SEND;
35+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBCOMP_RECEIVED;
36+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBCOMP_SEND;
37+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBLISH_RECEIVED;
38+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBLISH_SEND;
39+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBREC_RECEIVED;
40+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBREC_SEND;
41+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBREL_RECEIVED;
42+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBREL_SEND;
43+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.SUBACK_SEND;
44+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.SUBSCRIBE_RECEIVED;
45+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.TRUE;
46+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.UNSUBACK_SEND;
47+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.UNSUBSCRIBE_RECEIVED;
48+
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.VERBOSE;
4949

5050
public class MqttMessageLogConfigReader {
5151

‎src/main/java/com/hivemq/extensions/mqtt/message/log/initializer/ClientInitializerImpl.java‎ renamed to ‎src/main/java/com/hivemq/extensions/log/mqtt/initializer/ClientInitializerImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.hivemq.extensions.mqtt.message.log.initializer;
16+
package com.hivemq.extensions.log.mqtt.initializer;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
1919
import com.hivemq.extension.sdk.api.client.ClientContext;
2020
import com.hivemq.extension.sdk.api.client.parameter.InitializerInput;
2121
import com.hivemq.extension.sdk.api.services.Services;
2222
import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
23-
import com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig;
24-
import com.hivemq.extensions.mqtt.message.log.interceptor.InterceptorUtil;
23+
import com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig;
24+
import com.hivemq.extensions.log.mqtt.interceptor.InterceptorUtil;
2525

2626
/**
2727
* Creates a {@link ClientInitializer} that is usable since HiveMQ 4.3 Enterprise Version or Community Version 2020.1.

‎src/main/java/com/hivemq/extensions/mqtt/message/log/initializer/ClientInitializerImpl4_2.java‎ renamed to ‎src/main/java/com/hivemq/extensions/log/mqtt/initializer/ClientInitializerImpl4_2.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.hivemq.extensions.mqtt.message.log.initializer;
16+
package com.hivemq.extensions.log.mqtt.initializer;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
1919
import com.hivemq.extension.sdk.api.client.ClientContext;
2020
import com.hivemq.extension.sdk.api.client.parameter.InitializerInput;
2121
import com.hivemq.extension.sdk.api.services.Services;
2222
import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
23-
import com.hivemq.extensions.mqtt.message.log.config.MqttMessageLogConfig;
24-
import com.hivemq.extensions.mqtt.message.log.interceptor.ConnectDisconnectEventListener;
25-
import com.hivemq.extensions.mqtt.message.log.interceptor.ConnectInboundInterceptorImpl;
26-
import com.hivemq.extensions.mqtt.message.log.interceptor.InterceptorUtil;
23+
import com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig;
24+
import com.hivemq.extensions.log.mqtt.interceptor.ConnectDisconnectEventListener;
25+
import com.hivemq.extensions.log.mqtt.interceptor.ConnectInboundInterceptorImpl;
26+
import com.hivemq.extensions.log.mqtt.interceptor.InterceptorUtil;
2727

2828
/**
2929
* Creates a {@link ClientInitializer} that is usable for any HiveMQ 4.2 Enterprise Version.

‎src/main/java/com/hivemq/extensions/mqtt/message/log/interceptor/ConnackOutboundInterceptorImpl.java‎ renamed to ‎src/main/java/com/hivemq/extensions/log/mqtt/interceptor/ConnackOutboundInterceptorImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.hivemq.extensions.mqtt.message.log.interceptor;
16+
package com.hivemq.extensions.log.mqtt.interceptor;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
1919
import com.hivemq.extension.sdk.api.interceptor.connack.ConnackOutboundInterceptor;
2020
import com.hivemq.extension.sdk.api.interceptor.connack.parameter.ConnackOutboundInput;
2121
import com.hivemq.extension.sdk.api.interceptor.connack.parameter.ConnackOutboundOutput;
22-
import com.hivemq.extensions.mqtt.message.log.util.MessageLogUtil;
22+
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
2323
import org.slf4j.Logger;
2424
import org.slf4j.LoggerFactory;
2525

‎src/main/java/com/hivemq/extensions/mqtt/message/log/interceptor/ConnectDisconnectEventListener.java‎ renamed to ‎src/main/java/com/hivemq/extensions/log/mqtt/interceptor/ConnectDisconnectEventListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.hivemq.extensions.mqtt.message.log.interceptor;
16+
package com.hivemq.extensions.log.mqtt.interceptor;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
1919
import com.hivemq.extension.sdk.api.events.client.ClientLifecycleEventListener;
@@ -25,7 +25,7 @@
2525
import com.hivemq.extension.sdk.api.events.client.parameters.DisconnectEventInput;
2626
import com.hivemq.extension.sdk.api.events.client.parameters.ServerInitiatedDisconnectInput;
2727
import com.hivemq.extension.sdk.api.packets.connect.ConnectPacket;
28-
import com.hivemq.extensions.mqtt.message.log.util.MessageLogUtil;
28+
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;
3131

‎src/main/java/com/hivemq/extensions/mqtt/message/log/interceptor/ConnectInboundInterceptorImpl.java‎ renamed to ‎src/main/java/com/hivemq/extensions/log/mqtt/interceptor/ConnectInboundInterceptorImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.hivemq.extensions.mqtt.message.log.interceptor;
16+
package com.hivemq.extensions.log.mqtt.interceptor;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
1919
import com.hivemq.extension.sdk.api.interceptor.connect.ConnectInboundInterceptor;
2020
import com.hivemq.extension.sdk.api.interceptor.connect.parameter.ConnectInboundInput;
2121
import com.hivemq.extension.sdk.api.interceptor.connect.parameter.ConnectInboundOutput;
2222
import com.hivemq.extension.sdk.api.packets.connect.ConnectPacket;
23-
import com.hivemq.extensions.mqtt.message.log.util.MessageLogUtil;
23+
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
2424
import org.slf4j.Logger;
2525
import org.slf4j.LoggerFactory;
2626

‎src/main/java/com/hivemq/extensions/mqtt/message/log/interceptor/DisconnectInboundInterceptorImpl.java‎ renamed to ‎src/main/java/com/hivemq/extensions/log/mqtt/interceptor/DisconnectInboundInterceptorImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.hivemq.extensions.mqtt.message.log.interceptor;
16+
package com.hivemq.extensions.log.mqtt.interceptor;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
1919
import com.hivemq.extension.sdk.api.interceptor.disconnect.DisconnectInboundInterceptor;
2020
import com.hivemq.extension.sdk.api.interceptor.disconnect.parameter.DisconnectInboundInput;
2121
import com.hivemq.extension.sdk.api.interceptor.disconnect.parameter.DisconnectInboundOutput;
22-
import com.hivemq.extensions.mqtt.message.log.util.MessageLogUtil;
22+
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
2323
import org.slf4j.Logger;
2424
import org.slf4j.LoggerFactory;
2525

‎src/main/java/com/hivemq/extensions/mqtt/message/log/interceptor/DisconnectOutboundInterceptorImpl.java‎ renamed to ‎src/main/java/com/hivemq/extensions/log/mqtt/interceptor/DisconnectOutboundInterceptorImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.hivemq.extensions.mqtt.message.log.interceptor;
16+
package com.hivemq.extensions.log.mqtt.interceptor;
1717

1818
import com.hivemq.extension.sdk.api.annotations.NotNull;
1919
import com.hivemq.extension.sdk.api.interceptor.disconnect.DisconnectOutboundInterceptor;
2020
import com.hivemq.extension.sdk.api.interceptor.disconnect.parameter.DisconnectOutboundInput;
2121
import com.hivemq.extension.sdk.api.interceptor.disconnect.parameter.DisconnectOutboundOutput;
22-
import com.hivemq.extensions.mqtt.message.log.util.MessageLogUtil;
22+
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
2323
import org.slf4j.Logger;
2424
import org.slf4j.LoggerFactory;
2525

0 commit comments

Comments
 (0)