Change AbstractBuilder classes from protected to public (#1464)

* Change java codegen template for Builder from protected to public (#1463)

Signed-off-by: Matthias Bender <matthias.bender@embraceable.ai>

* Added java code generated changes for switching from protected to public (#1463)

Signed-off-by: Matthias Bender <matthias.bender@embraceable.ai>

* Added changelog entry (#1463)

Signed-off-by: Matthias Bender <matthias.bender@embraceable.ai>

* Change changelog dummy entry for pull to correct pull request (#1463)

Signed-off-by: Matthias Bender <matthias.bender@embraceable.ai>

* Changed visbility to public for missing AbstractBuilders under the src/main section

Signed-off-by: Matthias Bender <matthias.bender@embraceable.ai>

---------

Signed-off-by: Matthias Bender <matthias.bender@embraceable.ai>
Co-authored-by: Matthias Bender <matthias.bender@embraceable.ai>

CHANGELOG.md

@@ -51,6 +51,7 @@ This section is for maintaining a changelog for all breaking changes for the cli
 ### Dependencies
 
 ### Changed
+- Changed abstract builders visibility to public ([#1464](/~https://github.com/opensearch-project/opensearch-java/pull/1464))
 
 ### Deprecated
 

java-client/src/generated/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java

@@ -86,7 +86,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         private Boolean acknowledged;
 
         protected AbstractBuilder() {}

java-client/src/generated/java/org/opensearch/client/opensearch/_types/BaseNode.java

@@ -183,7 +183,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private Map<String, String> attributes;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/_types/IndicesResponseBase.java

@@ -79,7 +79,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
         AcknowledgedResponseBase.AbstractBuilder<BuilderT> {
         @Nullable
         private ShardStatistics shards;

java-client/src/generated/java/org/opensearch/client/opensearch/_types/ScriptBase.java

@@ -100,7 +100,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private Map<String, JsonData> params;
 

java-client/src/generated/java/org/opensearch/client/opensearch/_types/ShardsOperationResponseBase.java

@@ -86,7 +86,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         private ShardStatistics shards;
 
         protected AbstractBuilder() {}

java-client/src/generated/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java

@@ -190,7 +190,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private Boolean forcedRefresh;
         private String id;

java-client/src/generated/java/org/opensearch/client/opensearch/_types/aggregations/AggregationBase.java

@@ -113,7 +113,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private Map<String, JsonData> meta;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/_types/aggregations/BucketAggregationBase.java

@@ -52,7 +52,7 @@ protected BucketAggregationBase(AbstractBuilder<?> builder) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregationBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregationBase.AbstractBuilder<
         BuilderT> {
 
         protected AbstractBuilder() {}

java-client/src/generated/java/org/opensearch/client/opensearch/_types/aggregations/BucketPathAggregation.java

@@ -79,7 +79,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregationBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregationBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         private BucketsPath bucketsPath;

java-client/src/generated/java/org/opensearch/client/opensearch/_types/aggregations/CompositeValuesSource.java

@@ -177,7 +177,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private String field;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/_types/aggregations/FormatMetricAggregationBase.java

@@ -78,8 +78,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
-        MetricAggregationBase.AbstractBuilder<BuilderT> {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends MetricAggregationBase.AbstractBuilder<
+        BuilderT> {
         @Nullable
         private String format;
 

java-client/src/generated/java/org/opensearch/client/opensearch/_types/aggregations/FormattableMetricAggregation.java

@@ -78,8 +78,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
-        MetricAggregationBase.AbstractBuilder<BuilderT> {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends MetricAggregationBase.AbstractBuilder<
+        BuilderT> {
         @Nullable
         private String format;
 

java-client/src/generated/java/org/opensearch/client/opensearch/_types/aggregations/MatrixAggregation.java

@@ -110,7 +110,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregationBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregationBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         private List<String> fields;

java-client/src/generated/java/org/opensearch/client/opensearch/_types/aggregations/MetricAggregationBase.java

@@ -126,7 +126,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private String field;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationBase.java

@@ -112,7 +112,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
         PipelineAggregationBase.AbstractBuilder<BuilderT> {
         @Nullable
         private Boolean minimize;

java-client/src/generated/java/org/opensearch/client/opensearch/_types/aggregations/PipelineAggregationBase.java

@@ -99,8 +99,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
-        BucketPathAggregation.AbstractBuilder<BuilderT> {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends BucketPathAggregation.AbstractBuilder<
+        BuilderT> {
         @Nullable
         private String format;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/CharFilterBase.java

@@ -88,7 +88,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private String version;
 

java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java

@@ -186,7 +186,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends TokenFilterBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends TokenFilterBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         private String hyphenationPatternsPath;

java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java

@@ -88,7 +88,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private String version;
 

java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java

@@ -88,7 +88,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private String version;
 

java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/CorePropertyBase.java

@@ -118,7 +118,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends PropertyBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends PropertyBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         private List<String> copyTo;

java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DocValuesPropertyBase.java

@@ -78,7 +78,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends CorePropertyBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends CorePropertyBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         private Boolean docValues;

java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/NumberPropertyBase.java

@@ -129,8 +129,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
-        DocValuesPropertyBase.AbstractBuilder<BuilderT> {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends DocValuesPropertyBase.AbstractBuilder<
+        BuilderT> {
         @Nullable
         private Double boost;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/PropertyBase.java

@@ -178,7 +178,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private DynamicMapping dynamic;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/RangePropertyBase.java

@@ -112,8 +112,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
-        DocValuesPropertyBase.AbstractBuilder<BuilderT> {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends DocValuesPropertyBase.AbstractBuilder<
+        BuilderT> {
         @Nullable
         private Double boost;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/_types/query_dsl/DecayFunctionBase.java

@@ -87,7 +87,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private MultiValueMode multiValueMode;
 

java-client/src/generated/java/org/opensearch/client/opensearch/_types/query_dsl/QueryBase.java

@@ -109,7 +109,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private Float boost;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/_types/query_dsl/RangeQueryBase.java

@@ -77,8 +77,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends QueryBase.AbstractBuilder<
-        BuilderT> {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends QueryBase.AbstractBuilder<BuilderT> {
         @Nullable
         private RangeRelation relation;
 

java-client/src/generated/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunction.java

@@ -51,7 +51,7 @@ protected RankFeatureFunction(AbstractBuilder<?> builder) {}
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
 
         protected AbstractBuilder() {}
 

java-client/src/generated/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricBase.java

@@ -91,7 +91,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private Integer k;
 

java-client/src/generated/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricRatingThreshold.java

@@ -81,7 +81,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends RankEvalMetricBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends RankEvalMetricBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         private Integer relevantRatingThreshold;

java-client/src/generated/java/org/opensearch/client/opensearch/core/search/HighlightBase.java

@@ -515,7 +515,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private String boundaryChars;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/core/search/SuggesterBase.java

@@ -121,7 +121,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private String analyzer;
         private String field;

java-client/src/generated/java/org/opensearch/client/opensearch/indices/stats/IndexShardStatsBase.java

@@ -147,7 +147,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends IndexStatsBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends IndexStatsBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         private ShardCommit commit;

java-client/src/generated/java/org/opensearch/client/opensearch/indices/stats/IndexStatsBase.java

@@ -360,7 +360,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private CompletionStats completion;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/ingest/ProcessorBase.java

@@ -179,7 +179,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private String description;
         @Nullable

java-client/src/generated/java/org/opensearch/client/opensearch/nodes/NodesResponseBase.java

@@ -93,7 +93,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     // ---------------------------------------------------------------------------------------------
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         @Nullable
         private NodeStatistics nodeStats;