Apply package naming convention: rbac -> rbac.file

hivemq · Nov 20, 2023 · c60b0af · c60b0af
1 parent 19da7bf
commit c60b0af
Show file tree

Hide file tree

Showing 33 changed files with 99 additions and 99 deletions.
diff --git a/...q/extensions/rbac/ExtensionConstants.java → ...ensions/rbac/file/ExtensionConstants.java b/...q/extensions/rbac/ExtensionConstants.java → ...ensions/rbac/file/ExtensionConstants.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac;
+package com.hivemq.extensions.rbac.file;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 

diff --git a/...xtensions/rbac/FileAuthAuthenticator.java → ...ions/rbac/file/FileAuthAuthenticator.java b/...xtensions/rbac/FileAuthAuthenticator.java → ...ions/rbac/file/FileAuthAuthenticator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac;
+package com.hivemq.extensions.rbac.file;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.auth.SimpleAuthenticator;
@@ -24,8 +24,8 @@
 import com.hivemq.extension.sdk.api.client.parameter.Listener;
 import com.hivemq.extension.sdk.api.packets.auth.DefaultAuthorizationBehaviour;
 import com.hivemq.extension.sdk.api.packets.connect.ConnackReasonCode;
-import com.hivemq.extensions.rbac.configuration.entities.ExtensionConfig;
-import com.hivemq.extensions.rbac.utils.CredentialsValidator;
+import com.hivemq.extensions.rbac.file.configuration.entities.ExtensionConfig;
+import com.hivemq.extensions.rbac.file.utils.CredentialsValidator;
 
 import java.nio.ByteBuffer;
 import java.util.List;

diff --git a/.../hivemq/extensions/rbac/FileAuthMain.java → ...mq/extensions/rbac/file/FileAuthMain.java b/.../hivemq/extensions/rbac/FileAuthMain.java → ...mq/extensions/rbac/file/FileAuthMain.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac;
+package com.hivemq.extensions.rbac.file;
 
 import com.hivemq.extension.sdk.api.ExtensionMain;
 import com.hivemq.extension.sdk.api.annotations.NotNull;
@@ -23,10 +23,10 @@
 import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
 import com.hivemq.extension.sdk.api.services.Services;
-import com.hivemq.extensions.rbac.configuration.CredentialsConfiguration;
-import com.hivemq.extensions.rbac.configuration.ExtensionConfiguration;
-import com.hivemq.extensions.rbac.configuration.entities.ExtensionConfig;
-import com.hivemq.extensions.rbac.utils.CredentialsValidator;
+import com.hivemq.extensions.rbac.file.configuration.CredentialsConfiguration;
+import com.hivemq.extensions.rbac.file.configuration.ExtensionConfiguration;
+import com.hivemq.extensions.rbac.file.configuration.entities.ExtensionConfig;
+import com.hivemq.extensions.rbac.file.utils.CredentialsValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...sions/rbac/FileAuthenticatorProvider.java → .../rbac/file/FileAuthenticatorProvider.java b/...sions/rbac/FileAuthenticatorProvider.java → .../rbac/file/FileAuthenticatorProvider.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac;
+package com.hivemq.extensions.rbac.file;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;
 import com.hivemq.extension.sdk.api.auth.Authenticator;
 import com.hivemq.extension.sdk.api.auth.parameter.AuthenticatorProviderInput;
 import com.hivemq.extension.sdk.api.services.auth.provider.AuthenticatorProvider;
-import com.hivemq.extensions.rbac.configuration.entities.ExtensionConfig;
-import com.hivemq.extensions.rbac.utils.CredentialsValidator;
+import com.hivemq.extensions.rbac.file.configuration.entities.ExtensionConfig;
+import com.hivemq.extensions.rbac.file.utils.CredentialsValidator;
 
 class FileAuthenticatorProvider implements AuthenticatorProvider {
 

diff --git a/...ns/rbac/configuration/ConfigArchiver.java → ...ac/file/configuration/ConfigArchiver.java b/...ns/rbac/configuration/ConfigArchiver.java → ...ac/file/configuration/ConfigArchiver.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration;
+package com.hivemq.extensions.rbac.file.configuration;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;
 import com.hivemq.extension.sdk.api.annotations.ThreadSafe;
-import com.hivemq.extensions.rbac.configuration.entities.FileAuthConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.FileAuthConfig;
 import org.apache.commons.lang3.time.FastDateFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...iguration/ConfigCredentialsValidator.java → ...iguration/ConfigCredentialsValidator.java b/...iguration/ConfigCredentialsValidator.java → ...iguration/ConfigCredentialsValidator.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration;
+package com.hivemq.extensions.rbac.file.configuration;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
-import com.hivemq.extensions.rbac.configuration.entities.ExtensionConfig;
-import com.hivemq.extensions.rbac.configuration.entities.FileAuthConfig;
-import com.hivemq.extensions.rbac.configuration.entities.PasswordType;
-import com.hivemq.extensions.rbac.configuration.entities.Permission;
-import com.hivemq.extensions.rbac.configuration.entities.Role;
-import com.hivemq.extensions.rbac.configuration.entities.User;
+import com.hivemq.extensions.rbac.file.configuration.entities.ExtensionConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.FileAuthConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.PasswordType;
+import com.hivemq.extensions.rbac.file.configuration.entities.Permission;
+import com.hivemq.extensions.rbac.file.configuration.entities.Role;
+import com.hivemq.extensions.rbac.file.configuration.entities.User;
 
 import java.util.ArrayList;
 import java.util.HashSet;

diff --git a/...ions/rbac/configuration/ConfigParser.java → ...rbac/file/configuration/ConfigParser.java b/...ions/rbac/configuration/ConfigParser.java → ...rbac/file/configuration/ConfigParser.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration;
+package com.hivemq.extensions.rbac.file.configuration;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;
-import com.hivemq.extensions.rbac.configuration.entities.ExtensionConfig;
-import com.hivemq.extensions.rbac.configuration.entities.FileAuthConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.ExtensionConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.FileAuthConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...ns/rbac/configuration/ConfigResolver.java → ...ac/file/configuration/ConfigResolver.java b/...ns/rbac/configuration/ConfigResolver.java → ...ac/file/configuration/ConfigResolver.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration;
+package com.hivemq.extensions.rbac.file.configuration;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
-import com.hivemq.extensions.rbac.ExtensionConstants;
+import com.hivemq.extensions.rbac.file.ExtensionConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...nfiguration/CredentialsConfiguration.java → ...nfiguration/CredentialsConfiguration.java b/...nfiguration/CredentialsConfiguration.java → ...nfiguration/CredentialsConfiguration.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration;
+package com.hivemq.extensions.rbac.file.configuration;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;
 import com.hivemq.extension.sdk.api.annotations.ThreadSafe;
-import com.hivemq.extensions.rbac.configuration.entities.ExtensionConfig;
-import com.hivemq.extensions.rbac.configuration.entities.FileAuthConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.ExtensionConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.FileAuthConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,8 +34,8 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import static com.hivemq.extensions.rbac.ExtensionConstants.CREDENTIALS_LEGACY_LOCATION;
-import static com.hivemq.extensions.rbac.ExtensionConstants.CREDENTIALS_LOCATION;
+import static com.hivemq.extensions.rbac.file.ExtensionConstants.CREDENTIALS_LEGACY_LOCATION;
+import static com.hivemq.extensions.rbac.file.ExtensionConstants.CREDENTIALS_LOCATION;
 import static java.util.Collections.unmodifiableList;
 
 @ThreadSafe

diff --git a/...configuration/ExtensionConfiguration.java → ...configuration/ExtensionConfiguration.java b/...configuration/ExtensionConfiguration.java → ...configuration/ExtensionConfiguration.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration;
+package com.hivemq.extensions.rbac.file.configuration;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
-import com.hivemq.extensions.rbac.configuration.entities.ExtensionConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.ExtensionConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 
-import static com.hivemq.extensions.rbac.ExtensionConstants.EXTENSION_CONFIG_LEGACY_LOCATION;
-import static com.hivemq.extensions.rbac.ExtensionConstants.EXTENSION_CONFIG_LOCATION;
+import static com.hivemq.extensions.rbac.file.ExtensionConstants.EXTENSION_CONFIG_LEGACY_LOCATION;
+import static com.hivemq.extensions.rbac.file.ExtensionConstants.EXTENSION_CONFIG_LOCATION;
 
 public class ExtensionConfiguration {
 

diff --git a/...nfiguration/NotMarshallableException.java → ...nfiguration/NotMarshallableException.java b/...nfiguration/NotMarshallableException.java → ...nfiguration/NotMarshallableException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration;
+package com.hivemq.extensions.rbac.file.configuration;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 

diff --git a/...ensions/rbac/configuration/XmlParser.java → ...ns/rbac/file/configuration/XmlParser.java b/...ensions/rbac/configuration/XmlParser.java → ...ns/rbac/file/configuration/XmlParser.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration;
+package com.hivemq.extensions.rbac.file.configuration;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.ThreadSafe;
-import com.hivemq.extensions.rbac.configuration.entities.ExtensionConfig;
-import com.hivemq.extensions.rbac.configuration.entities.FileAuthConfig;
-import com.hivemq.extensions.rbac.configuration.entities.User;
+import com.hivemq.extensions.rbac.file.configuration.entities.ExtensionConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.FileAuthConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...nfiguration/entities/ExtensionConfig.java → ...nfiguration/entities/ExtensionConfig.java b/...nfiguration/entities/ExtensionConfig.java → ...nfiguration/entities/ExtensionConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration.entities;
+package com.hivemq.extensions.rbac.file.configuration.entities;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;

diff --git a/...onfiguration/entities/FileAuthConfig.java → ...onfiguration/entities/FileAuthConfig.java b/...onfiguration/entities/FileAuthConfig.java → ...onfiguration/entities/FileAuthConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration.entities;
+package com.hivemq.extensions.rbac.file.configuration.entities;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;

diff --git a/.../configuration/entities/PasswordType.java → .../configuration/entities/PasswordType.java b/.../configuration/entities/PasswordType.java → .../configuration/entities/PasswordType.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration.entities;
+package com.hivemq.extensions.rbac.file.configuration.entities;
 
 public enum PasswordType {
     HASHED,

diff --git a/...ac/configuration/entities/Permission.java → ...le/configuration/entities/Permission.java b/...ac/configuration/entities/Permission.java → ...le/configuration/entities/Permission.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration.entities;
+package com.hivemq.extensions.rbac.file.configuration.entities;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;

diff --git a/...ons/rbac/configuration/entities/Role.java → ...bac/file/configuration/entities/Role.java b/...ons/rbac/configuration/entities/Role.java → ...bac/file/configuration/entities/Role.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration.entities;
+package com.hivemq.extensions.rbac.file.configuration.entities;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;

diff --git a/...ons/rbac/configuration/entities/User.java → ...bac/file/configuration/entities/User.java b/...ons/rbac/configuration/entities/User.java → ...bac/file/configuration/entities/User.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration.entities;
+package com.hivemq.extensions.rbac.file.configuration.entities;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;

diff --git a/...ons/rbac/generator/PasswordGenerator.java → ...bac/file/generator/PasswordGenerator.java b/...ons/rbac/generator/PasswordGenerator.java → ...bac/file/generator/PasswordGenerator.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.generator;
+package com.hivemq.extensions.rbac.file.generator;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;
-import com.hivemq.extensions.rbac.utils.Hashing;
+import com.hivemq.extensions.rbac.file.utils.Hashing;
 import org.apache.commons.lang3.RandomStringUtils;
 
 import java.nio.charset.StandardCharsets;

diff --git a/...ensions/rbac/utils/CredentialsHasher.java → ...ns/rbac/file/utils/CredentialsHasher.java b/...ensions/rbac/utils/CredentialsHasher.java → ...ns/rbac/file/utils/CredentialsHasher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.utils;
+package com.hivemq.extensions.rbac.file.utils;
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;

diff --git a/...ions/rbac/utils/CredentialsValidator.java → ...rbac/file/utils/CredentialsValidator.java b/...ions/rbac/utils/CredentialsValidator.java → ...rbac/file/utils/CredentialsValidator.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.utils;
+package com.hivemq.extensions.rbac.file.utils;
 
 import com.codahale.metrics.MetricRegistry;
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;
 import com.hivemq.extension.sdk.api.annotations.ThreadSafe;
 import com.hivemq.extension.sdk.api.auth.parameter.TopicPermission;
 import com.hivemq.extension.sdk.api.services.builder.Builders;
-import com.hivemq.extensions.rbac.configuration.CredentialsConfiguration;
-import com.hivemq.extensions.rbac.configuration.entities.ExtensionConfig;
-import com.hivemq.extensions.rbac.configuration.entities.FileAuthConfig;
-import com.hivemq.extensions.rbac.configuration.entities.PasswordType;
-import com.hivemq.extensions.rbac.configuration.entities.Permission;
-import com.hivemq.extensions.rbac.configuration.entities.Role;
-import com.hivemq.extensions.rbac.configuration.entities.User;
+import com.hivemq.extensions.rbac.file.configuration.CredentialsConfiguration;
+import com.hivemq.extensions.rbac.file.configuration.entities.ExtensionConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.FileAuthConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.PasswordType;
+import com.hivemq.extensions.rbac.file.configuration.entities.Permission;
+import com.hivemq.extensions.rbac.file.configuration.entities.Role;
+import com.hivemq.extensions.rbac.file.configuration.entities.User;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;

diff --git a/...hivemq/extensions/rbac/utils/Hashing.java → ...q/extensions/rbac/file/utils/Hashing.java b/...hivemq/extensions/rbac/utils/Hashing.java → ...q/extensions/rbac/file/utils/Hashing.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.utils;
+package com.hivemq.extensions.rbac.file.utils;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import org.bouncycastle.crypto.digests.SHA512Digest;

diff --git a/...q/extensions/rbac/utils/Substitution.java → ...ensions/rbac/file/utils/Substitution.java b/...q/extensions/rbac/utils/Substitution.java → ...ensions/rbac/file/utils/Substitution.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.utils;
+package com.hivemq.extensions.rbac.file.utils;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import org.apache.commons.text.StringSubstitutor;

diff --git a/...sions/rbac/FileAuthAuthenticatorTest.java → .../rbac/file/FileAuthAuthenticatorTest.java b/...sions/rbac/FileAuthAuthenticatorTest.java → .../rbac/file/FileAuthAuthenticatorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac;
+package com.hivemq.extensions.rbac.file;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.Nullable;
@@ -35,8 +35,8 @@
 import com.hivemq.extension.sdk.api.packets.connect.WillPublishPacket;
 import com.hivemq.extension.sdk.api.packets.general.MqttVersion;
 import com.hivemq.extension.sdk.api.packets.general.UserProperties;
-import com.hivemq.extensions.rbac.configuration.entities.ExtensionConfig;
-import com.hivemq.extensions.rbac.utils.CredentialsValidator;
+import com.hivemq.extensions.rbac.file.configuration.entities.ExtensionConfig;
+import com.hivemq.extensions.rbac.file.utils.CredentialsValidator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/...s/rbac/FileAuthenticatorProviderTest.java → ...c/file/FileAuthenticatorProviderTest.java b/...s/rbac/FileAuthenticatorProviderTest.java → ...c/file/FileAuthenticatorProviderTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac;
+package com.hivemq.extensions.rbac.file;
 
 import com.hivemq.extension.sdk.api.auth.Authenticator;
 import com.hivemq.extension.sdk.api.auth.parameter.AuthenticatorProviderInput;
-import com.hivemq.extensions.rbac.configuration.entities.ExtensionConfig;
-import com.hivemq.extensions.rbac.utils.CredentialsValidator;
+import com.hivemq.extensions.rbac.file.configuration.entities.ExtensionConfig;
+import com.hivemq.extensions.rbac.file.utils.CredentialsValidator;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertSame;

diff --git a/...bac/configuration/ConfigArchiverTest.java → ...ile/configuration/ConfigArchiverTest.java b/...bac/configuration/ConfigArchiverTest.java → ...ile/configuration/ConfigArchiverTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hivemq.extensions.rbac.configuration;
+package com.hivemq.extensions.rbac.file.configuration;
 
 import com.hivemq.extension.sdk.api.annotations.NotNull;
-import com.hivemq.extensions.rbac.configuration.entities.FileAuthConfig;
-import com.hivemq.extensions.rbac.configuration.entities.Permission;
-import com.hivemq.extensions.rbac.configuration.entities.Role;
+import com.hivemq.extensions.rbac.file.configuration.entities.FileAuthConfig;
+import com.hivemq.extensions.rbac.file.configuration.entities.Permission;
+import com.hivemq.extensions.rbac.file.configuration.entities.Role;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;