Skip to content

Commit a016daf

Browse files
tombentleytombentley
authored
Repackage simple transformation filters using @DeprecatedPluginName (kroxylicious#3149)
* Change simple transformation filters' package using @DeprecatedPluginName From `io.kroxylicious.proxy.filter.simpletransform` to `io.kroxylicious.filter.simpletransform` (remove proxy). Signed-off-by: Tom Bentley <tbentley@redhat.com>
1 parent 0fdfea4 commit a016daf

19 files changed

Lines changed: 44 additions & 37 deletions

kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/proxy/filter/simpletransform/ByteBufferTransformation.java renamed to kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/filter/simpletransform/ByteBufferTransformation.java

Lines changed: 1 addition & 1 deletion
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.simpletransform;
6+
package io.kroxylicious.filter.simpletransform;
77

88
import java.nio.ByteBuffer;
99

kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/proxy/filter/simpletransform/ByteBufferTransformationFactory.java renamed to kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/filter/simpletransform/ByteBufferTransformationFactory.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.simpletransform;
7+
package io.kroxylicious.filter.simpletransform;
88

99
import io.kroxylicious.proxy.plugin.PluginConfigurationException;
1010

kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/proxy/filter/simpletransform/FetchResponseTransformation.java renamed to kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/filter/simpletransform/FetchResponseTransformation.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
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.simpletransform;
7+
package io.kroxylicious.filter.simpletransform;
88

99
import java.util.Objects;
1010

1111
import com.fasterxml.jackson.annotation.JsonProperty;
1212

13+
import io.kroxylicious.filter.simpletransform.FetchResponseTransformation.Config;
14+
import io.kroxylicious.proxy.filter.Filter;
1315
import io.kroxylicious.proxy.filter.FilterFactory;
1416
import io.kroxylicious.proxy.filter.FilterFactoryContext;
15-
import io.kroxylicious.proxy.filter.simpletransform.FetchResponseTransformation.Config;
17+
import io.kroxylicious.proxy.plugin.DeprecatedPluginName;
1618
import io.kroxylicious.proxy.plugin.Plugin;
1719
import io.kroxylicious.proxy.plugin.PluginImplConfig;
1820
import io.kroxylicious.proxy.plugin.PluginImplName;
@@ -25,16 +27,18 @@
2527
* A {@link FilterFactory} for {@link FetchResponseTransformationFilter}.
2628
*/
2729
@Plugin(configType = FetchResponseTransformation.Config.class)
30+
@DeprecatedPluginName(oldName = "io.kroxylicious.proxy.filter.simpletransform.FetchResponseTransformation", since = "0.19.0")
2831
public class FetchResponseTransformation implements FilterFactory<Config, Config> {
2932

3033
@Override
31-
public @NonNull Config initialize(FilterFactoryContext context, @Nullable Config config) {
34+
public Config initialize(FilterFactoryContext context, @Nullable Config config) {
3235
return Plugins.requireConfig(this, config);
3336
}
3437

3538
@Override
36-
public FetchResponseTransformationFilter createFilter(FilterFactoryContext context,
37-
@NonNull Config configuration) {
39+
@SuppressWarnings({ "rawtypes", "unchecked", "java:S2638" })
40+
public Filter createFilter(FilterFactoryContext context,
41+
@NonNull Config configuration) {
3842
var factory = context.pluginInstance(ByteBufferTransformationFactory.class, configuration.transformation());
3943
Objects.requireNonNull(factory, "Violated contract of FilterCreationContext");
4044
return new FetchResponseTransformationFilter(factory.createTransformation(configuration.transformationConfig()));

kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/proxy/filter/simpletransform/FetchResponseTransformationFilter.java renamed to kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/filter/simpletransform/FetchResponseTransformationFilter.java

Lines changed: 1 addition & 3 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.simpletransform;
7+
package io.kroxylicious.filter.simpletransform;
88

99
import java.util.List;
1010
import java.util.Map;
@@ -49,8 +49,6 @@ class FetchResponseTransformationFilter implements FetchResponseFilter {
4949
*/
5050
private final ByteBufferTransformation valueTransformation;
5151

52-
// TODO: add transformation support for key/header/topic
53-
5452
FetchResponseTransformationFilter(ByteBufferTransformation valueTransformation) {
5553
this.valueTransformation = valueTransformation;
5654
}

kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/proxy/filter/simpletransform/ProduceRequestTransformation.java renamed to kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/filter/simpletransform/ProduceRequestTransformation.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
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.simpletransform;
7+
package io.kroxylicious.filter.simpletransform;
88

99
import javax.annotation.Nullable;
1010

1111
import com.fasterxml.jackson.annotation.JsonProperty;
1212

13+
import io.kroxylicious.filter.simpletransform.ProduceRequestTransformation.Config;
1314
import io.kroxylicious.proxy.filter.Filter;
1415
import io.kroxylicious.proxy.filter.FilterFactory;
1516
import io.kroxylicious.proxy.filter.FilterFactoryContext;
16-
import io.kroxylicious.proxy.filter.simpletransform.ProduceRequestTransformation.Config;
17+
import io.kroxylicious.proxy.plugin.DeprecatedPluginName;
1718
import io.kroxylicious.proxy.plugin.Plugin;
1819
import io.kroxylicious.proxy.plugin.PluginImplConfig;
1920
import io.kroxylicious.proxy.plugin.PluginImplName;
@@ -26,14 +27,15 @@
2627
*
2728
*/
2829
@Plugin(configType = ProduceRequestTransformation.Config.class)
30+
@DeprecatedPluginName(oldName = "io.kroxylicious.proxy.filter.simpletransform.ProduceRequestTransformation", since = "0.19.0")
2931
public class ProduceRequestTransformation
3032
implements FilterFactory<Config, Config> {
3133
public record Config(
3234
@PluginImplName(ByteBufferTransformationFactory.class) @JsonProperty(required = true) String transformation,
3335
@PluginImplConfig(implNameProperty = "transformation") Object transformationConfig) {}
3436

3537
@Override
36-
@SuppressWarnings({ "rawtypes", "unchecked" })
38+
@SuppressWarnings({ "rawtypes", "unchecked", "java:S2638" })
3739
public Filter createFilter(FilterFactoryContext context,
3840
@NonNull Config configuration) {
3941
ByteBufferTransformationFactory factory = context.pluginInstance(ByteBufferTransformationFactory.class, configuration.transformation());
@@ -42,7 +44,7 @@ public Filter createFilter(FilterFactoryContext context,
4244

4345
@Override
4446
@SuppressWarnings({ "unchecked" })
45-
public @NonNull Config initialize(FilterFactoryContext context, @Nullable Config config) {
47+
public Config initialize(FilterFactoryContext context, @Nullable Config config) {
4648
var result = Plugins.requireConfig(this, config);
4749
var transformationFactory = context.pluginInstance(ByteBufferTransformationFactory.class, result.transformation());
4850
transformationFactory.validateConfiguration(result.transformationConfig());

kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/proxy/filter/simpletransform/ProduceRequestTransformationFilter.java renamed to kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/filter/simpletransform/ProduceRequestTransformationFilter.java

Lines changed: 1 addition & 3 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.simpletransform;
7+
package io.kroxylicious.filter.simpletransform;
88

99
import java.util.Map;
1010
import java.util.concurrent.CompletionStage;
@@ -46,8 +46,6 @@ class ProduceRequestTransformationFilter implements ProduceRequestFilter, ApiVer
4646
*/
4747
private final ByteBufferTransformation valueTransformation;
4848

49-
// TODO: add transformation support for key/header/topic
50-
5149
ProduceRequestTransformationFilter(ByteBufferTransformation valueTransformation) {
5250
this.valueTransformation = valueTransformation;
5351
}

kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/proxy/filter/simpletransform/Replacing.java renamed to kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/filter/simpletransform/Replacing.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
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.simpletransform;
7+
package io.kroxylicious.filter.simpletransform;
88

99
import java.io.IOException;
10+
import java.io.UncheckedIOException;
1011
import java.nio.ByteBuffer;
1112
import java.nio.charset.Charset;
1213
import java.nio.charset.IllegalCharsetNameException;
@@ -19,10 +20,12 @@
1920

2021
import com.fasterxml.jackson.annotation.JsonProperty;
2122

23+
import io.kroxylicious.proxy.plugin.DeprecatedPluginName;
2224
import io.kroxylicious.proxy.plugin.Plugin;
2325
import io.kroxylicious.proxy.plugin.PluginConfigurationException;
2426

2527
@Plugin(configType = Replacing.Config.class)
28+
@DeprecatedPluginName(oldName = "io.kroxylicious.proxy.filter.simpletransform.Replacing", since = "0.19.0")
2629
public class Replacing implements ByteBufferTransformationFactory<Replacing.Config> {
2730
public record Config(
2831
@JsonProperty String charset,
@@ -81,7 +84,7 @@ public static class Transformation implements ByteBufferTransformation {
8184
}
8285
}
8386
catch (IOException e) {
84-
throw new RuntimeException(e);
87+
throw new UncheckedIOException(e);
8588
}
8689
}
8790

kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/proxy/filter/simpletransform/UpperCasing.java renamed to kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/filter/simpletransform/UpperCasing.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@
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.simpletransform;
7+
package io.kroxylicious.filter.simpletransform;
88

99
import java.nio.ByteBuffer;
1010
import java.nio.charset.Charset;
1111
import java.nio.charset.IllegalCharsetNameException;
1212
import java.nio.charset.UnsupportedCharsetException;
1313

14+
import io.kroxylicious.proxy.plugin.DeprecatedPluginName;
1415
import io.kroxylicious.proxy.plugin.Plugin;
1516
import io.kroxylicious.proxy.plugin.PluginConfigurationException;
1617

1718
@Plugin(configType = UpperCasing.Config.class)
19+
@DeprecatedPluginName(oldName = "io.kroxylicious.proxy.filter.simpletransform.UpperCasing", since = "0.19.0")
1820
public class UpperCasing implements ByteBufferTransformationFactory<UpperCasing.Config> {
1921
public record Config(String charset) {}
2022

kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/proxy/filter/simpletransform/package-info.java renamed to kroxylicious-filters/kroxylicious-simple-transform/src/main/java/io/kroxylicious/filter/simpletransform/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.simpletransform;
10+
package io.kroxylicious.filter.simpletransform;
1111

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

kroxylicious-filters/kroxylicious-simple-transform/src/main/resources/META-INF/services/io.kroxylicious.proxy.filter.simpletransform.ByteBufferTransformationFactory renamed to kroxylicious-filters/kroxylicious-simple-transform/src/main/resources/META-INF/services/io.kroxylicious.filter.simpletransform.ByteBufferTransformationFactory

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

7-
io.kroxylicious.proxy.filter.simpletransform.UpperCasing
8-
io.kroxylicious.proxy.filter.simpletransform.Replacing
7+
io.kroxylicious.filter.simpletransform.UpperCasing
8+
io.kroxylicious.filter.simpletransform.Replacing

0 commit comments

Comments
 (0)