Change AbstractBuilder classes from protected to public (#1469)

matthiasValuecloud · Matthias Bender · web-flow · commit 74761fe8c342 · 2025-03-05T12:13:04.000+13:00
* Change java codegen template for Builder from protected to public

Signed-off-by: Matthias Bender &lt;matthias.bender@embraceable.ai&gt;

* Added java-codegen generated classes with changed visibility

Signed-off-by: Matthias Bender &lt;matthias.bender@embraceable.ai&gt;

* Changed visiblity for not java-codegen generated abstract builder classes from protected to public

Signed-off-by: Matthias Bender &lt;matthias.bender@embraceable.ai&gt;

* Added Changelog entry for change of visibility

Signed-off-by: Matthias Bender &lt;matthias.bender@embraceable.ai&gt;

---------

Signed-off-by: Matthias Bender &lt;matthias.bender@embraceable.ai&gt;
Co-authored-by: Matthias Bender &lt;matthias.bender@embraceable.ai&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Bump `org.junit:junit-bom` from 5.11.4 to 5.12.0 ([#1456](https://github.com/opensearch-project/opensearch-java/pull/1456))
 
 ### Changed
+- Changed abstract builders visibility to public ([#1464](https://github.com/opensearch-project/opensearch-java/pull/1464))
 
 ### Deprecated
 
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/WriteResponseBase.java b/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;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/analysis/TokenizerBase.java b/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;
 
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/CorePropertyBase.java b/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;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/mapping/DocValuesPropertyBase.java b/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;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java
@@ -79,7 +79,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;
 
         /**
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/BaseNode.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/BaseNode.java
@@ -158,7 +158,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;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/IndicesResponseBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/IndicesResponseBase.java
@@ -73,7 +73,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;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/RequestBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/RequestBase.java
@@ -77,7 +77,7 @@ public Boolean human() {
         return this.human;
     }
 
-    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 errorTrace;
         @Nullable
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ScriptBase.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 Map<String, JsonData> params;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardsOperationResponseBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/ShardsOperationResponseBase.java
@@ -77,7 +77,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;
 
         /**
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregateBase.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 Map<String, JsonData> meta;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/AggregationBase.java
@@ -105,7 +105,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;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketAggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/BucketAggregationBase.java
@@ -50,7 +50,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> {}
 
     // ---------------------------------------------------------------------------------------------
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeValuesSource.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeValuesSource.java
@@ -156,7 +156,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link CompositeValuesSource}.
      */
 
-    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;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/ExtendedStatsAggregate.java
@@ -288,7 +288,7 @@ public ExtendedStatsAggregate build() {
         }
     }
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends StatsAggregate.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends StatsAggregate.AbstractBuilder<
         BuilderT> {
         private Double sumOfSquares;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormatMetricAggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormatMetricAggregationBase.java
@@ -72,8 +72,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;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormattableMetricAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/FormattableMetricAggregation.java
@@ -72,8 +72,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;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixAggregation.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MatrixAggregation.java
@@ -99,7 +99,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;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MetricAggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MetricAggregationBase.java
@@ -119,7 +119,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;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MovingAverageAggregationBase.java
@@ -106,7 +106,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;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketAggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketAggregateBase.java
@@ -75,7 +75,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     }
 
-    protected abstract static class AbstractBuilder<TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>> extends
+    public abstract static class AbstractBuilder<TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>> extends
         AggregateBase.AbstractBuilder<BuilderT> {
         private Buckets<TBucket> buckets;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/MultiBucketBase.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
         protected Map<String, Aggregate> aggregations = new HashMap<>();
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesAggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PercentilesAggregateBase.java
@@ -68,7 +68,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     }
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
         BuilderT> {
         private Percentiles values;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PipelineAggregationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/PipelineAggregationBase.java
@@ -107,7 +107,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;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/RangeAggregate.java
@@ -88,7 +88,7 @@ public RangeAggregate build() {
         }
     }
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends
         MultiBucketAggregateBase.AbstractBuilder<RangeBucket, BuilderT> {}
 
     // ---------------------------------------------------------------------------------------------
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTermsBucketBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SignificantTermsBucketBase.java
@@ -80,7 +80,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     }
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends MultiBucketBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends MultiBucketBase.AbstractBuilder<
         BuilderT> {
         private Double score;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleBucketAggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleBucketAggregateBase.java
@@ -81,7 +81,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     }
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         protected Map<String, Aggregate> aggregations = new HashMap<>();
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleMetricAggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/SingleMetricAggregateBase.java
@@ -91,7 +91,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     }
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
         BuilderT> {
         private Double value;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsAggregate.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/StatsAggregate.java
@@ -243,7 +243,7 @@ public StatsAggregate build() {
         }
     }
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregateBase.AbstractBuilder<
         BuilderT> {
         private Long count;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregateBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsAggregateBase.java
@@ -85,7 +85,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     }
 
-    protected abstract static class AbstractBuilder<TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>> extends
+    public abstract static class AbstractBuilder<TBucket, BuilderT extends AbstractBuilder<TBucket, BuilderT>> extends
         MultiBucketAggregateBase.AbstractBuilder<TBucket, BuilderT> {
         @Nullable
         private Long docCountErrorUpperBound;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsBucketBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/TermsBucketBase.java
@@ -72,7 +72,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     }
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends MultiBucketBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends MultiBucketBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         private Long docCountError;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CharFilterBase.java
@@ -81,7 +81,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;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/CompoundWordTokenFilterBase.java
@@ -179,7 +179,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;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/analysis/TokenFilterBase.java
@@ -81,7 +81,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;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/NumberPropertyBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/NumberPropertyBase.java
@@ -89,8 +89,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 Boolean index;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/PropertyBase.java
@@ -203,7 +203,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> localMetadata;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RangePropertyBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/RangePropertyBase.java
@@ -106,8 +106,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;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/StandardNumberProperty.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/StandardNumberProperty.java
@@ -108,7 +108,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     }
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends NumberPropertyBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends NumberPropertyBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         private Boolean coerce;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayFunctionBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/DecayFunctionBase.java
@@ -70,7 +70,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
     }
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ScoreFunctionBase.AbstractBuilder<
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ScoreFunctionBase.AbstractBuilder<
         BuilderT> {
         @Nullable
         private MultiValueMode multiValueMode;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/QueryBase.java
@@ -102,7 +102,7 @@ protected <BuilderT extends AbstractBuilder<BuilderT>> BuilderT toBuilder(Builde
         return builder.queryName(queryName).boost(boost);
     }
 
-    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;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeQueryBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RangeQueryBase.java
@@ -70,8 +70,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;
 
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunction.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/RankFeatureFunction.java
@@ -39,7 +39,7 @@
 public abstract class RankFeatureFunction {
     public RankFeatureFunction() {}
 
-    protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
+    public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {
         protected abstract BuilderT self();
 
     }
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScoreFunctionBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/ScoreFunctionBase.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/cat/CatRequestBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/cat/CatRequestBase.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/BulkOperationBase.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/WriteOperation.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/bulk/WriteOperation.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/get/GetResult.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/get/GetResult.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResult.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/msearch/MultiSearchResult.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricBase.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricRatingTreshold.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/rank_eval/RankEvalMetricRatingTreshold.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SearchResult.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SearchResult.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggesterBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/SuggesterBase.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/ingest/ProcessorBase.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/MemoryStats.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/MemoryStats.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesResponseBase.java b/java-client/src/main/java/org/opensearch/client/opensearch/nodes/NodesResponseBase.java
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/tasks/ListResponse.java b/java-client/src/main/java/org/opensearch/client/opensearch/tasks/ListResponse.java
diff --git a/java-client/src/main/java/org/opensearch/client/transport/endpoints/DictionaryResponse.java b/java-client/src/main/java/org/opensearch/client/transport/endpoints/DictionaryResponse.java
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/base/BaseClass.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/base/BaseClass.java
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/child/ChildClass.java b/java-client/src/test/java/org/opensearch/client/opensearch/experiments/inheritance/child/ChildClass.java
diff --git a/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder.mustache b/java-codegen/src/main/resources/org/opensearch/client/codegen/templates/ObjectShape/Builder.mustache

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {`
`79`	`79`
`80`	`80`	`}`
`81`	`81`
`82`		`- protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
	`82`	`+ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
`83`	`83`	`private Boolean acknowledged;`
`84`	`84`
`85`	`85`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {`
`158`	`158`
`159`	`159`	`}`
`160`	`160`
`161`		`- protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
	`161`	`+ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
`162`	`162`	`@Nullable`
`163`	`163`	`private Map<String, String> attributes;`
`164`	`164`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {`
`73`	`73`
`74`	`74`	`}`
`75`	`75`
`76`		`- protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends`
	`76`	`+ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends`
`77`	`77`	`AcknowledgedResponseBase.AbstractBuilder<BuilderT> {`
`78`	`78`	`@Nullable`
`79`	`79`	`private ShardStatistics shards;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public Boolean human() {`
`77`	`77`	`return this.human;`
`78`	`78`	`}`
`79`	`79`
`80`		`- protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
	`80`	`+ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
`81`	`81`	`@Nullable`
`82`	`82`	`private Boolean errorTrace;`
`83`	`83`	`@Nullable`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {`
`88`	`88`
`89`	`89`	`}`
`90`	`90`
`91`		`- protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
	`91`	`+ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
`92`	`92`	`@Nullable`
`93`	`93`	`private Map<String, JsonData> params;`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {`
`77`	`77`
`78`	`78`	`}`
`79`	`79`
`80`		`- protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
	`80`	`+ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
`81`	`81`	`private ShardStatistics shards;`
`82`	`82`
`83`	`83`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {`
`105`	`105`
`106`	`106`	`}`
`107`	`107`
`108`		`- protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
	`108`	`+ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends ObjectBuilderBase {`
`109`	`109`	`@Nullable`
`110`	`110`	`private Map<String, JsonData> meta;`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ protected BucketAggregationBase(AbstractBuilder<?> builder) {`
`50`	`50`
`51`	`51`	`}`
`52`	`52`
`53`		`- protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregationBase.AbstractBuilder<`
	`53`	`+ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends AggregationBase.AbstractBuilder<`
`54`	`54`	`BuilderT> {}`
`55`	`55`
`56`	`56`	`// ---------------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ public ExtendedStatsAggregate build() {`
`288`	`288`	`}`
`289`	`289`	`}`
`290`	`290`
`291`		`- protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends StatsAggregate.AbstractBuilder<`
	`291`	`+ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends StatsAggregate.AbstractBuilder<`
`292`	`292`	`BuilderT> {`
`293`	`293`	`private Double sumOfSquares;`
`294`	`294`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {`
`72`	`72`
`73`	`73`	`}`
`74`	`74`
`75`		`- protected abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends`
`76`		`- MetricAggregationBase.AbstractBuilder<BuilderT> {`
	`75`	`+ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>> extends MetricAggregationBase.AbstractBuilder<`
	`76`	`+ BuilderT> {`
`77`	`77`	`@Nullable`
`78`	`78`	`private String format;`
`79`	`79`