Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Thomas Farr <[email protected]>
  • Loading branch information
@Xtansia
Xtansia committed Jan 5, 2025
1 parent b9e9e58 commit 080b606
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 114 deletions.
27 changes: 15 additions & 12 deletions .../src/generated/java/org/opensearch/client/opensearch/nodes/info/NodeInfoSettingsNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class NodeInfoSettingsNode implements PlainJsonSerializable, ToCopyableBu
// ---------------------------------------------------------------------------------------------

private NodeInfoSettingsNode(Builder builder) {
this.attr = ApiTypeHelper.unmodifiableRequired(builder.attr, this, "attr");
this.attr = ApiTypeHelper.unmodifiable(builder.attr);
this.maxLocalStorageNodes = builder.maxLocalStorageNodes;
this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
}
Expand All @@ -84,7 +84,7 @@ public static NodeInfoSettingsNode of(Function<NodeInfoSettingsNode.Builder, Obj
}

/**
* Required - API name: {@code attr}
* API name: {@code attr}
*/
@Nonnull
public final Map<String, JsonData> attr() {
Expand Down Expand Up @@ -118,13 +118,15 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
}

protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
generator.writeKey("attr");
generator.writeStartObject();
for (Map.Entry<String, JsonData> item0 : this.attr.entrySet()) {
generator.writeKey(item0.getKey());
item0.getValue().serialize(generator, mapper);
if (ApiTypeHelper.isDefined(this.attr)) {
generator.writeKey("attr");
generator.writeStartObject();
for (Map.Entry<String, JsonData> item0 : this.attr.entrySet()) {
generator.writeKey(item0.getKey());
item0.getValue().serialize(generator, mapper);
}
generator.writeEnd();
}
generator.writeEnd();

if (this.maxLocalStorageNodes != null) {
generator.writeKey("max_local_storage_nodes");
Expand Down Expand Up @@ -152,6 +154,7 @@ public static Builder builder() {
* Builder for {@link NodeInfoSettingsNode}.
*/
public static class Builder extends ObjectBuilderBase implements CopyableBuilder<Builder, NodeInfoSettingsNode> {
@Nullable
private Map<String, JsonData> attr;
@Nullable
private String maxLocalStorageNodes;
Expand All @@ -178,7 +181,7 @@ public Builder copy() {
}

/**
* Required - API name: {@code attr}
* API name: {@code attr}
*
* <p>
* Adds all elements of <code>map</code> to <code>attr</code>.
Expand All @@ -191,7 +194,7 @@ public final Builder attr(Map<String, JsonData> map) {
}

/**
* Required - API name: {@code attr}
* API name: {@code attr}
*
* <p>
* Adds an entry to <code>attr</code>.
Expand Down Expand Up @@ -254,7 +257,7 @@ protected static void setupNodeInfoSettingsNodeDeserializer(ObjectDeserializer<N
@Override
public int hashCode() {
int result = 17;
result = 31 * result + this.attr.hashCode();
result = 31 * result + Objects.hashCode(this.attr);
result = 31 * result + Objects.hashCode(this.maxLocalStorageNodes);
result = 31 * result + this.name.hashCode();
return result;
Expand All @@ -265,7 +268,7 @@ public boolean equals(Object o) {
if (this == o) return true;
if (o == null || this.getClass() != o.getClass()) return false;
NodeInfoSettingsNode other = (NodeInfoSettingsNode) o;
return this.attr.equals(other.attr)
return Objects.equals(this.attr, other.attr)
&& Objects.equals(this.maxLocalStorageNodes, other.maxLocalStorageNodes)
&& this.name.equals(other.name);
}
Expand Down
110 changes: 8 additions & 102 deletions java-codegen/opensearch-openapi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52192,8 +52192,7 @@ components:
value:
description: The value to be appended. Supports template snippets.
type: array
items:
type: object
items: {}
allow_duplicates:
description: If `false`, the processor does not append values already present in the field.
type: boolean
Expand All @@ -52214,7 +52213,8 @@ components:
description: |-
The number of chars being used for extraction to prevent huge fields.
Use `-1` for no limit.
type: number
type: integer
format: int64
indexed_chars_field:
$ref: '#/components/schemas/_common___Field'
properties:
Expand Down Expand Up @@ -52255,6 +52255,7 @@ components:
error_distance:
description: The difference between the resulting inscribed distance from center to side and the circle's radius (measured in meters for `geo_shape`, unit-less for `shape`).
type: number
format: double
field:
$ref: '#/components/schemas/_common___Field'
ignore_missing:
Expand Down Expand Up @@ -52305,7 +52306,6 @@ components:
Value used to fill empty fields.
Empty fields are skipped if this is not provided.
An empty field is one with no value (2 consecutive separators) or empty quotes (`""`).
type: object
field:
$ref: '#/components/schemas/_common___Field'
ignore_missing:
Expand Down Expand Up @@ -52432,38 +52432,6 @@ components:
allOf:
- $ref: '#/components/schemas/ingest._common___ProcessorBase'
- type: object
ingest._common___EnrichProcessor:
allOf:
- $ref: '#/components/schemas/ingest._common___ProcessorBase'
- type: object
properties:
field:
$ref: '#/components/schemas/_common___Field'
ignore_missing:
description: If `true` and `field` does not exist, the processor quietly exits without modifying the document.
type: boolean
max_matches:
description: |-
The maximum number of matched documents to include under the configured target field.
The `target_field` will be turned into a JSON array if `max_matches` is higher than 1, otherwise `target_field` will become a JSON object.
In order to avoid documents getting too large, the maximum allowed value is 128.
type: number
override:
description: |-
If processor will update fields with pre-existing non-null-valued field.
When set to `false`, such fields will not be touched.
type: boolean
policy_name:
description: The name of the enrich policy to use.
type: string
shape_relation:
$ref: '#/components/schemas/_common___GeoShapeRelation'
target_field:
$ref: '#/components/schemas/_common___Field'
required:
- field
- policy_name
- target_field
ingest._common___FailProcessor:
allOf:
- $ref: '#/components/schemas/ingest._common___ProcessorBase'
Expand Down Expand Up @@ -52568,61 +52536,6 @@ components:
- field
- pattern
- replacement
ingest._common___InferenceConfig:
type: object
properties:
regression:
$ref: '#/components/schemas/ingest._common___InferenceConfigRegression'
classification:
$ref: '#/components/schemas/ingest._common___InferenceConfigClassification'
minProperties: 1
maxProperties: 1
ingest._common___InferenceConfigClassification:
type: object
properties:
num_top_classes:
description: Specifies the number of top class predictions to return.
type: number
num_top_feature_importance_values:
description: Specifies the maximum number of feature importance values per document.
type: number
results_field:
$ref: '#/components/schemas/_common___Field'
top_classes_results_field:
$ref: '#/components/schemas/_common___Field'
prediction_field_type:
description: |-
Specifies the type of the predicted field to write.
Valid values are: `string`, `number`, `boolean`.
type: string
ingest._common___InferenceConfigRegression:
type: object
properties:
results_field:
$ref: '#/components/schemas/_common___Field'
num_top_feature_importance_values:
description: Specifies the maximum number of feature importance values per document.
type: number
ingest._common___InferenceProcessor:
allOf:
- $ref: '#/components/schemas/ingest._common___ProcessorBase'
- type: object
properties:
model_id:
$ref: '#/components/schemas/_common___Id'
target_field:
$ref: '#/components/schemas/_common___Field'
field_map:
description: |-
Maps the document field names to the known field names of the model.
This mapping takes precedence over any default mappings provided in the model configuration.
type: object
additionalProperties:
type: object
inference_config:
$ref: '#/components/schemas/ingest._common___InferenceConfig'
required:
- model_id
ingest._common___JoinProcessor:
allOf:
- $ref: '#/components/schemas/ingest._common___ProcessorBase'
Expand Down Expand Up @@ -52801,8 +52714,6 @@ components:
$ref: '#/components/schemas/ingest._common___DateIndexNameProcessor'
dot_expander:
$ref: '#/components/schemas/ingest._common___DotExpanderProcessor'
enrich:
$ref: '#/components/schemas/ingest._common___EnrichProcessor'
fail:
$ref: '#/components/schemas/ingest._common___FailProcessor'
foreach:
Expand Down Expand Up @@ -52853,8 +52764,6 @@ components:
$ref: '#/components/schemas/ingest._common___DropProcessor'
circle:
$ref: '#/components/schemas/ingest._common___CircleProcessor'
inference:
$ref: '#/components/schemas/ingest._common___InferenceProcessor'
text_embedding:
$ref: '#/components/schemas/ingest._common___TextEmbeddingProcessor'
minProperties: 1
Expand Down Expand Up @@ -52914,7 +52823,6 @@ components:
The value to be set for the field.
Supports template snippets.
May specify only one of `value` or `copy_from`.
type: object
required:
- field
ingest._common___SetSecurityUserProcessor:
Expand All @@ -52935,7 +52843,7 @@ components:
type: string
enum:
- geo_shape
- shape
- xy_shape
ingest._common___SortProcessor:
allOf:
- $ref: '#/components/schemas/ingest._common___ProcessorBase'
Expand Down Expand Up @@ -52982,9 +52890,9 @@ components:
type: object
additionalProperties:
type: string
description:
type: string
description: A brief description of the processor.
batch_size:
type: integer
format: int32
required:
- field_map
- model_id
Expand Down Expand Up @@ -53073,7 +52981,6 @@ components:
$ref: '#/components/schemas/_common___IndexName'
_source:
description: JSON body for the document.
type: object
required:
- _source
ingest.simulate___DocumentSimulation:
Expand Down Expand Up @@ -55051,7 +54958,6 @@ components:
max_local_storage_nodes:
type: string
required:
- attr
- name
nodes.info___NodeInfoSettingsPlugins:
type: object
Expand Down

0 comments on commit 080b606

Please sign in to comment.