From 61e02d51c060f39a2cf63925ed3c5afee6c4c591 Mon Sep 17 00:00:00 2001 From: "Sverre H. Huseby" Date: Mon, 30 Oct 2023 14:30:51 +0100 Subject: [PATCH] more granular package name --- README.md | 4 ++++ .../authz/spiffe}/AbstractPrincipalBuilder.java | 2 +- .../authz/spiffe}/SpiffePrincipalBuilder.java | 2 +- .../authz/spiffe}/SpiffePrincipalBuilderTest.java | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) rename src/main/java/io/statnett/{k3aspiffe => k3a/authz/spiffe}/AbstractPrincipalBuilder.java (99%) rename src/main/java/io/statnett/{k3aspiffe => k3a/authz/spiffe}/SpiffePrincipalBuilder.java (98%) rename src/test/java/io/statnett/{k3aspiffe => k3a/authz/spiffe}/SpiffePrincipalBuilderTest.java (99%) diff --git a/README.md b/README.md index a32a010..62a775d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,11 @@ Then the broker must be instructed to use this class to build principals by adding the following to the configuration file: ```properties +<<<<<<< Updated upstream principal.builder.class=io.statnett.k3a-spiffe.SpiffePrincipalBuilder +======= +principal.builder.class=io.statnett.k3a.authz.spiffe.SpiffePrincipalBuilder +>>>>>>> Stashed changes ``` ## References diff --git a/src/main/java/io/statnett/k3aspiffe/AbstractPrincipalBuilder.java b/src/main/java/io/statnett/k3a/authz/spiffe/AbstractPrincipalBuilder.java similarity index 99% rename from src/main/java/io/statnett/k3aspiffe/AbstractPrincipalBuilder.java rename to src/main/java/io/statnett/k3a/authz/spiffe/AbstractPrincipalBuilder.java index 7d1ca30..01bc8cb 100644 --- a/src/main/java/io/statnett/k3aspiffe/AbstractPrincipalBuilder.java +++ b/src/main/java/io/statnett/k3a/authz/spiffe/AbstractPrincipalBuilder.java @@ -1,4 +1,4 @@ -package io.statnett.k3aspiffe; +package io.statnett.k3a.authz.spiffe; import org.apache.kafka.common.Configurable; import org.apache.kafka.common.config.internals.BrokerSecurityConfigs; diff --git a/src/main/java/io/statnett/k3aspiffe/SpiffePrincipalBuilder.java b/src/main/java/io/statnett/k3a/authz/spiffe/SpiffePrincipalBuilder.java similarity index 98% rename from src/main/java/io/statnett/k3aspiffe/SpiffePrincipalBuilder.java rename to src/main/java/io/statnett/k3a/authz/spiffe/SpiffePrincipalBuilder.java index 0415f1e..135c470 100644 --- a/src/main/java/io/statnett/k3aspiffe/SpiffePrincipalBuilder.java +++ b/src/main/java/io/statnett/k3a/authz/spiffe/SpiffePrincipalBuilder.java @@ -1,4 +1,4 @@ -package io.statnett.k3aspiffe; +package io.statnett.k3a.authz.spiffe; import org.apache.kafka.common.security.auth.AuthenticationContext; import org.apache.kafka.common.security.auth.KafkaPrincipal; diff --git a/src/test/java/io/statnett/k3aspiffe/SpiffePrincipalBuilderTest.java b/src/test/java/io/statnett/k3a/authz/spiffe/SpiffePrincipalBuilderTest.java similarity index 99% rename from src/test/java/io/statnett/k3aspiffe/SpiffePrincipalBuilderTest.java rename to src/test/java/io/statnett/k3a/authz/spiffe/SpiffePrincipalBuilderTest.java index 9ea29f3..1cf536b 100644 --- a/src/test/java/io/statnett/k3aspiffe/SpiffePrincipalBuilderTest.java +++ b/src/test/java/io/statnett/k3a/authz/spiffe/SpiffePrincipalBuilderTest.java @@ -1,4 +1,4 @@ -package io.statnett.k3aspiffe; +package io.statnett.k3a.authz.spiffe; import org.apache.kafka.common.security.auth.AuthenticationContext; import org.apache.kafka.common.security.auth.KafkaPrincipal;