Skip to content

Commit a9a247c

Browse files
authored
Change MultiTenant filter's package using @DeprecatedPluginName (kroxylicious#3117)
From `io.kroxylicious.proxy.filter.multitenant` to `io.kroxylicious.filter.multitenant` (removed `proxy`). Signed-off-by: Tom Bentley <tbentley@redhat.com>
1 parent dc3e3b0 commit a9a247c

36 files changed

Lines changed: 15 additions & 13 deletions

kroxylicious-filters/kroxylicious-multitenant/src/main/java/io/kroxylicious/proxy/filter/multitenant/MultiTenant.java renamed to kroxylicious-filters/kroxylicious-multitenant/src/main/java/io/kroxylicious/filter/multitenant/MultiTenant.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
* Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
55
*/
66

7-
package io.kroxylicious.proxy.filter.multitenant;
7+
package io.kroxylicious.filter.multitenant;
88

99
import java.util.Objects;
1010

11+
import io.kroxylicious.filter.multitenant.config.MultiTenantConfig;
1112
import io.kroxylicious.proxy.filter.Filter;
1213
import io.kroxylicious.proxy.filter.FilterFactory;
1314
import io.kroxylicious.proxy.filter.FilterFactoryContext;
14-
import io.kroxylicious.proxy.filter.multitenant.config.MultiTenantConfig;
15+
import io.kroxylicious.proxy.plugin.DeprecatedPluginName;
1516
import io.kroxylicious.proxy.plugin.Plugin;
1617

1718
import edu.umd.cs.findbugs.annotations.Nullable;
@@ -20,6 +21,7 @@
2021
* A {@link FilterFactory} for {@link MultiTenantFilter}.
2122
*/
2223
@Plugin(configType = MultiTenantConfig.class)
24+
@DeprecatedPluginName(oldName = "io.kroxylicious.proxy.filter.multitenant.MultiTenant", since = "0.19.0")
2325
public class MultiTenant implements FilterFactory<MultiTenantConfig, MultiTenantConfig> {
2426

2527
private static final MultiTenantConfig DEFAULT_TENANT_CONFIG = new MultiTenantConfig(null);

kroxylicious-filters/kroxylicious-multitenant/src/main/java/io/kroxylicious/proxy/filter/multitenant/MultiTenantFilter.java renamed to kroxylicious-filters/kroxylicious-multitenant/src/main/java/io/kroxylicious/filter/multitenant/MultiTenantFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
55
*/
6-
package io.kroxylicious.proxy.filter.multitenant;
6+
package io.kroxylicious.filter.multitenant;
77

88
import java.util.Map;
99
import java.util.Objects;
@@ -60,6 +60,7 @@
6060
import org.apache.kafka.common.message.TxnOffsetCommitResponseData;
6161
import org.apache.kafka.common.protocol.ApiKeys;
6262

63+
import io.kroxylicious.filter.multitenant.config.MultiTenantConfig;
6364
import io.kroxylicious.kafka.transform.ApiVersionsResponseTransformer;
6465
import io.kroxylicious.proxy.filter.AddOffsetsToTxnRequestFilter;
6566
import io.kroxylicious.proxy.filter.AddPartitionsToTxnRequestFilter;
@@ -106,7 +107,6 @@
106107
import io.kroxylicious.proxy.filter.SyncGroupRequestFilter;
107108
import io.kroxylicious.proxy.filter.TxnOffsetCommitRequestFilter;
108109
import io.kroxylicious.proxy.filter.TxnOffsetCommitResponseFilter;
109-
import io.kroxylicious.proxy.filter.multitenant.config.MultiTenantConfig;
110110

111111
import edu.umd.cs.findbugs.annotations.Nullable;
112112

kroxylicious-filters/kroxylicious-multitenant/src/main/java/io/kroxylicious/proxy/filter/multitenant/config/MultiTenantConfig.java renamed to kroxylicious-filters/kroxylicious-multitenant/src/main/java/io/kroxylicious/filter/multitenant/config/MultiTenantConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
55
*/
66

7-
package io.kroxylicious.proxy.filter.multitenant.config;
7+
package io.kroxylicious.filter.multitenant.config;
88

99
import java.util.Objects;
1010

kroxylicious-filters/kroxylicious-multitenant/src/main/java/io/kroxylicious/proxy/filter/multitenant/config/package-info.java renamed to kroxylicious-filters/kroxylicious-multitenant/src/main/java/io/kroxylicious/filter/multitenant/config/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@ReturnValuesAreNonnullByDefault
88
@DefaultAnnotationForParameters(NonNull.class)
99
@DefaultAnnotation(NonNull.class)
10-
package io.kroxylicious.proxy.filter.multitenant.config;
10+
package io.kroxylicious.filter.multitenant.config;
1111

1212
import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
1313
import edu.umd.cs.findbugs.annotations.DefaultAnnotationForParameters;

kroxylicious-filters/kroxylicious-multitenant/src/main/java/io/kroxylicious/proxy/filter/multitenant/package-info.java renamed to kroxylicious-filters/kroxylicious-multitenant/src/main/java/io/kroxylicious/filter/multitenant/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@ReturnValuesAreNonnullByDefault
88
@DefaultAnnotationForParameters(NonNull.class)
99
@DefaultAnnotation(NonNull.class)
10-
package io.kroxylicious.proxy.filter.multitenant;
10+
package io.kroxylicious.filter.multitenant;
1111

1212
import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
1313
import edu.umd.cs.findbugs.annotations.DefaultAnnotationForParameters;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
io.kroxylicious.proxy.filter.multitenant.MultiTenant
1+
io.kroxylicious.filter.multitenant.MultiTenant

kroxylicious-filters/kroxylicious-multitenant/src/test/java/io/kroxylicious/proxy/filter/multitenant/MultiTenantFilterTest.java renamed to kroxylicious-filters/kroxylicious-multitenant/src/test/java/io/kroxylicious/filter/multitenant/MultiTenantFilterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
55
*/
66

7-
package io.kroxylicious.proxy.filter.multitenant;
7+
package io.kroxylicious.filter.multitenant;
88

99
import java.io.IOException;
1010
import java.time.Duration;
@@ -42,13 +42,13 @@
4242
import com.google.common.reflect.ClassPath;
4343
import com.google.common.reflect.ClassPath.ResourceInfo;
4444

45+
import io.kroxylicious.filter.multitenant.config.MultiTenantConfig;
4546
import io.kroxylicious.proxy.filter.Filter;
4647
import io.kroxylicious.proxy.filter.FilterAndInvoker;
4748
import io.kroxylicious.proxy.filter.FilterContext;
4849
import io.kroxylicious.proxy.filter.FilterInvoker;
4950
import io.kroxylicious.proxy.filter.RequestFilterResult;
5051
import io.kroxylicious.proxy.filter.ResponseFilterResult;
51-
import io.kroxylicious.proxy.filter.multitenant.config.MultiTenantConfig;
5252
import io.kroxylicious.test.condition.kafka.FetchResponseDataCondition;
5353
import io.kroxylicious.test.requestresponsetestdef.ApiMessageTestDef;
5454
import io.kroxylicious.test.requestresponsetestdef.RequestResponseTestDef;

kroxylicious-filters/kroxylicious-multitenant/src/test/java/io/kroxylicious/proxy/filter/multitenant/MultiTenantTest.java renamed to kroxylicious-filters/kroxylicious-multitenant/src/test/java/io/kroxylicious/filter/multitenant/MultiTenantTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
* Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
55
*/
66

7-
package io.kroxylicious.proxy.filter.multitenant;
7+
package io.kroxylicious.filter.multitenant;
88

99
import org.junit.jupiter.api.Test;
1010
import org.mockito.Mockito;
1111

12+
import io.kroxylicious.filter.multitenant.config.MultiTenantConfig;
1213
import io.kroxylicious.proxy.filter.Filter;
1314
import io.kroxylicious.proxy.filter.FilterFactoryContext;
14-
import io.kroxylicious.proxy.filter.multitenant.config.MultiTenantConfig;
1515

1616
import static org.assertj.core.api.Assertions.assertThat;
1717

kroxylicious-filters/kroxylicious-multitenant/src/test/resources/io/kroxylicious/proxy/filter/multitenant/AddOffsetsToTxn.test.yaml renamed to kroxylicious-filters/kroxylicious-multitenant/src/test/resources/io/kroxylicious/filter/multitenant/AddOffsetsToTxn.test.yaml

File renamed without changes.

kroxylicious-filters/kroxylicious-multitenant/src/test/resources/io/kroxylicious/proxy/filter/multitenant/AddPartitionsToTxn.test.yaml renamed to kroxylicious-filters/kroxylicious-multitenant/src/test/resources/io/kroxylicious/filter/multitenant/AddPartitionsToTxn.test.yaml

File renamed without changes.

0 commit comments

Comments
 (0)