Skip to content

Commit

Permalink
Apply package naming convention: log.mqtt -> log.mqtt.message
Browse files Browse the repository at this point in the history
  • Loading branch information
SgtSilvio committed Nov 21, 2023
1 parent 378af56 commit 33c9a77
Show file tree
Hide file tree
Showing 32 changed files with 86 additions and 86 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt;
package com.hivemq.extensions.log.mqtt.message;

import com.hivemq.extension.sdk.api.ExtensionMain;
import com.hivemq.extension.sdk.api.annotations.NotNull;
Expand All @@ -25,10 +25,10 @@
import com.hivemq.extension.sdk.api.services.Services;
import com.hivemq.extension.sdk.api.services.admin.LicenseEdition;
import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
import com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig;
import com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfigReader;
import com.hivemq.extensions.log.mqtt.initializer.ClientInitializerImpl;
import com.hivemq.extensions.log.mqtt.initializer.ClientInitializerImpl4_2;
import com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig;
import com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfigReader;
import com.hivemq.extensions.log.mqtt.message.initializer.ClientInitializerImpl;
import com.hivemq.extensions.log.mqtt.message.initializer.ClientInitializerImpl4_2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.config;
package com.hivemq.extensions.log.mqtt.message.config;

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.config;
package com.hivemq.extensions.log.mqtt.message.config;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import org.slf4j.Logger;
Expand All @@ -24,28 +24,28 @@
import java.io.InputStream;
import java.util.Properties;

import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.CLIENT_CONNECT;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.CLIENT_DISCONNECT;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.CONNACK_SEND;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.FALSE;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PING_REQ_RECEIVED;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PING_RESP_SEND;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBACK_RECEIVED;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBACK_SEND;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBCOMP_RECEIVED;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBCOMP_SEND;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBLISH_RECEIVED;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBLISH_SEND;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBREC_RECEIVED;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBREC_SEND;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBREL_RECEIVED;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.PUBREL_SEND;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.SUBACK_SEND;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.SUBSCRIBE_RECEIVED;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.TRUE;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.UNSUBACK_SEND;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.UNSUBSCRIBE_RECEIVED;
import static com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig.VERBOSE;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.CLIENT_CONNECT;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.CLIENT_DISCONNECT;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.CONNACK_SEND;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.FALSE;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PING_REQ_RECEIVED;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PING_RESP_SEND;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PUBACK_RECEIVED;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PUBACK_SEND;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PUBCOMP_RECEIVED;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PUBCOMP_SEND;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PUBLISH_RECEIVED;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PUBLISH_SEND;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PUBREC_RECEIVED;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PUBREC_SEND;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PUBREL_RECEIVED;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.PUBREL_SEND;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.SUBACK_SEND;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.SUBSCRIBE_RECEIVED;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.TRUE;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.UNSUBACK_SEND;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.UNSUBSCRIBE_RECEIVED;
import static com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig.VERBOSE;

public class MqttMessageLogConfigReader {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.initializer;
package com.hivemq.extensions.log.mqtt.message.initializer;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.client.ClientContext;
import com.hivemq.extension.sdk.api.client.parameter.InitializerInput;
import com.hivemq.extension.sdk.api.services.Services;
import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
import com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig;
import com.hivemq.extensions.log.mqtt.interceptor.InterceptorUtil;
import com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig;
import com.hivemq.extensions.log.mqtt.message.interceptor.InterceptorUtil;

/**
* Creates a {@link ClientInitializer} that is usable since HiveMQ 4.3 Enterprise Version or Community Version 2020.1.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.initializer;
package com.hivemq.extensions.log.mqtt.message.initializer;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.client.ClientContext;
import com.hivemq.extension.sdk.api.client.parameter.InitializerInput;
import com.hivemq.extension.sdk.api.services.Services;
import com.hivemq.extension.sdk.api.services.intializer.ClientInitializer;
import com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig;
import com.hivemq.extensions.log.mqtt.interceptor.ConnectDisconnectEventListener;
import com.hivemq.extensions.log.mqtt.interceptor.ConnectInboundInterceptorImpl;
import com.hivemq.extensions.log.mqtt.interceptor.InterceptorUtil;
import com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig;
import com.hivemq.extensions.log.mqtt.message.interceptor.ConnectDisconnectEventListener;
import com.hivemq.extensions.log.mqtt.message.interceptor.ConnectInboundInterceptorImpl;
import com.hivemq.extensions.log.mqtt.message.interceptor.InterceptorUtil;

/**
* Creates a {@link ClientInitializer} that is usable for any HiveMQ 4.2 Enterprise Version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.connack.ConnackOutboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.connack.parameter.ConnackOutboundInput;
import com.hivemq.extension.sdk.api.interceptor.connack.parameter.ConnackOutboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.events.client.ClientLifecycleEventListener;
Expand All @@ -25,7 +25,7 @@
import com.hivemq.extension.sdk.api.events.client.parameters.DisconnectEventInput;
import com.hivemq.extension.sdk.api.events.client.parameters.ServerInitiatedDisconnectInput;
import com.hivemq.extension.sdk.api.packets.connect.ConnectPacket;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.connect.ConnectInboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.connect.parameter.ConnectInboundInput;
import com.hivemq.extension.sdk.api.interceptor.connect.parameter.ConnectInboundOutput;
import com.hivemq.extension.sdk.api.packets.connect.ConnectPacket;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.disconnect.DisconnectInboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.disconnect.parameter.DisconnectInboundInput;
import com.hivemq.extension.sdk.api.interceptor.disconnect.parameter.DisconnectInboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.disconnect.DisconnectOutboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.disconnect.parameter.DisconnectOutboundInput;
import com.hivemq.extension.sdk.api.interceptor.disconnect.parameter.DisconnectOutboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.connack.ConnackOutboundInterceptor;
Expand All @@ -36,7 +36,7 @@
import com.hivemq.extension.sdk.api.interceptor.subscribe.SubscribeInboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.unsuback.UnsubackOutboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.unsubscribe.UnsubscribeInboundInterceptor;
import com.hivemq.extensions.log.mqtt.config.MqttMessageLogConfig;
import com.hivemq.extensions.log.mqtt.message.config.MqttMessageLogConfig;

import java.util.Optional;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.pingreq.PingReqInboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.pingreq.parameter.PingReqInboundInput;
import com.hivemq.extension.sdk.api.interceptor.pingreq.parameter.PingReqInboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.pingresp.PingRespOutboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.pingresp.parameter.PingRespOutboundInput;
import com.hivemq.extension.sdk.api.interceptor.pingresp.parameter.PingRespOutboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.puback.PubackInboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.puback.parameter.PubackInboundInput;
import com.hivemq.extension.sdk.api.interceptor.puback.parameter.PubackInboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.puback.PubackOutboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.puback.parameter.PubackOutboundInput;
import com.hivemq.extension.sdk.api.interceptor.puback.parameter.PubackOutboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.pubcomp.PubcompInboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.pubcomp.parameter.PubcompInboundInput;
import com.hivemq.extension.sdk.api.interceptor.pubcomp.parameter.PubcompInboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.pubcomp.PubcompOutboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.pubcomp.parameter.PubcompOutboundInput;
import com.hivemq.extension.sdk.api.interceptor.pubcomp.parameter.PubcompOutboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.publish.PublishInboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.publish.parameter.PublishInboundInput;
import com.hivemq.extension.sdk.api.interceptor.publish.parameter.PublishInboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.publish.PublishOutboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.publish.parameter.PublishOutboundInput;
import com.hivemq.extension.sdk.api.interceptor.publish.parameter.PublishOutboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.hivemq.extensions.log.mqtt.interceptor;
package com.hivemq.extensions.log.mqtt.message.interceptor;

import com.hivemq.extension.sdk.api.annotations.NotNull;
import com.hivemq.extension.sdk.api.interceptor.pubrec.PubrecInboundInterceptor;
import com.hivemq.extension.sdk.api.interceptor.pubrec.parameter.PubrecInboundInput;
import com.hivemq.extension.sdk.api.interceptor.pubrec.parameter.PubrecInboundOutput;
import com.hivemq.extensions.log.mqtt.util.MessageLogUtil;
import com.hivemq.extensions.log.mqtt.message.util.MessageLogUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Loading

0 comments on commit 33c9a77

Please sign in to comment.