Use records to make code more concise (#445)

I believe this is a compatible change. Also since source compatibility is
set to Java 17 I think records are guaranteed to be available in all
compatible runtimes.

Signed-off-by: Andrew Ross <andrross@amazon.com>

Author: andrross

spring-data-opensearch/src/main/java/org/opensearch/data/client/orhlc/ScriptField.java

@@ -13,23 +13,9 @@
 
 /**
  * Scripted field
+ *
  * @since 0.1
  */
-public class ScriptField {
-
-    private final String fieldName;
-    private final Script script;
-
-    public ScriptField(String fieldName, Script script) {
-        this.fieldName = fieldName;
-        this.script = script;
-    }
-
-    public String fieldName() {
-        return fieldName;
-    }
+public record ScriptField(String fieldName, Script script) {
 
-    public Script script() {
-        return script;
-    }
 }

spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/Aggregation.java

@@ -18,27 +18,26 @@
 import org.opensearch.client.opensearch._types.aggregations.Aggregate;
 
 /**
- * Class to combine an OpenSearch {@link org.opensearch.client.opensearch._types.aggregations.Aggregate} with its
- * name. Necessary as the OpenSearch Aggregate does not know its name.
+ * Class to combine an OpenSearch {@link Aggregate} with its name. Necessary as the OpenSearch Aggregate does not know its name.
  *
  * @author Peter-Josef Meisch
  * @since 4.4
  */
-public class Aggregation {
-
-    private final String name;
-    private final Aggregate aggregate;
-
-    public Aggregation(String name, Aggregate aggregate) {
-        this.name = name;
-        this.aggregate = aggregate;
-    }
+public record Aggregation(String name, Aggregate aggregate) {
 
+    /**
+     * @deprecated Use {@link #name()} instead
+     */
+    @Deprecated
     public String getName() {
-        return name;
+        return name();
     }
 
+    /**
+     * @deprecated Use {@link #aggregate()} instead
+     */
+    @Deprecated
     public Aggregate getAggregate() {
-        return aggregate;
+        return aggregate();
     }
 }

spring-data-opensearch/src/main/java/org/opensearch/data/client/osc/OpenSearchAggregation.java

@@ -18,20 +18,11 @@
 import org.springframework.data.elasticsearch.core.AggregationContainer;
 
 /**
- * {@link AggregationContainer} for a {@link Aggregation} that holds OpenEearch data.
+ * {@link AggregationContainer} for a {@link Aggregation} that holds OpenSearch data.
+ *
  * @author Peter-Josef Meisch
  * @since 4.4
  */
-public class OpenSearchAggregation implements AggregationContainer<Aggregation> {
-
-    private final Aggregation aggregation;
-
-    public OpenSearchAggregation(Aggregation aggregation) {
-        this.aggregation = aggregation;
-    }
+public record OpenSearchAggregation(Aggregation aggregation) implements AggregationContainer<Aggregation> {
 
-    @Override
-    public Aggregation aggregation() {
-        return aggregation;
-    }
 }

spring-data-opensearch/src/test/java/org/opensearch/data/client/core/aggregation/AggregationOSCIntegrationTests.java

@@ -54,7 +54,7 @@ protected void assertThatAggsHasResult(AggregationsContainer<?> aggregationsCont
         List<OpenSearchAggregation> aggregations = ((OpenSearchAggregations) aggregationsContainer).aggregations();
         List<String> aggNames = aggregations.stream() //
                 .map(OpenSearchAggregation::aggregation) //
-                .map(org.opensearch.data.client.osc.Aggregation::getName) //
+                .map(org.opensearch.data.client.osc.Aggregation::name) //
                 .collect(Collectors.toList());
         assertThat(aggNames).contains(aggsName);
 
@@ -77,8 +77,8 @@ protected void assertThatPipelineAggsAreCorrect(
             AggregationsContainer<?> aggregationsContainer, String aggsName, String pipelineAggsName) {
         Map<String, Aggregate> aggregates = ((OpenSearchAggregations) aggregationsContainer).aggregations().stream() //
                 .map(OpenSearchAggregation::aggregation) //
-                .collect(Collectors.toMap(org.opensearch.data.client.osc.Aggregation::getName,
-                        org.opensearch.data.client.osc.Aggregation::getAggregate));
+                .collect(Collectors.toMap(org.opensearch.data.client.osc.Aggregation::name,
+                        org.opensearch.data.client.osc.Aggregation::aggregate));
 
         assertThat(aggregates).containsKey(aggsName);
         Aggregate aggregate = aggregates.get(pipelineAggsName);