Fix tests

Author: jen-huang

x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetSecretResponse.java

@@ -24,12 +24,8 @@ public class GetSecretResponse extends ActionResponse implements ToXContentObjec
 
     public GetSecretResponse(StreamInput in) throws IOException {
         super(in);
-        id = in.readString();
-        if (in.readByte() == 0) {
-            value = in.readString();
-        } else {
-            value = in.readStringArray();
-        }
+        this.id = in.readString();
+        this.value = in.readString();
     }
 
     public GetSecretResponse(String id, Object value) {

x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/PostSecretRequest.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
+import org.elasticsearch.xcontent.XContentParser.Token;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -33,12 +34,13 @@ public class PostSecretRequest extends ActionRequest {
 
     static {
         PARSER.declareField(ConstructingObjectParser.optionalConstructorArg(), (p, c) -> {
-            if (p.currentToken() == XContentParser.Token.VALUE_STRING) {
+            Token token = p.currentToken();
+            if (token == XContentParser.Token.VALUE_STRING) {
                 return p.text();
-            } else if (p.currentToken() == XContentParser.Token.START_ARRAY) {
+            } else if (token == XContentParser.Token.START_ARRAY) {
                 return p.list().stream().map(s -> (String) s).toArray(String[]::new);
             } else {
-                throw new IllegalArgumentException("Unexpected token: " + p.currentToken());
+                throw new IllegalArgumentException("Unexpected token: " + token);
             }
         }, VALUE_FIELD, ObjectParser.ValueType.STRING_ARRAY);
     }
@@ -50,19 +52,12 @@ public static PostSecretRequest fromXContent(XContentParser parser) throws IOExc
     private final Object value;
 
     public PostSecretRequest(Object value) {
-        if ((value instanceof String == false) && (value instanceof String[] == false)) {
-            throw new IllegalArgumentException("value must be a string or an array of strings");
-        }
         this.value = value;
     }
 
     public PostSecretRequest(StreamInput in) throws IOException {
         super(in);
-        if (in.readByte() == 0) {
-            this.value = in.readString();
-        } else {
-            this.value = in.readStringArray();
-        }
+        this.value = in.readString();
     }
 
     public Object value() {
@@ -84,10 +79,8 @@ public XContentBuilder toXContent(XContentBuilder builder) throws IOException {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         if (value instanceof String) {
-            out.writeBoolean(true);
             out.writeString((String) value);
         } else if (value instanceof String[]) {
-            out.writeBoolean(false);
             out.writeStringArray((String[]) value);
         }
     }
@@ -100,6 +93,12 @@ public ActionRequestValidationException validate() {
             return exception;
         }
 
+        if ((this.value instanceof String == false) && (this.value instanceof String[] == false)) {
+            ActionRequestValidationException exception = new ActionRequestValidationException();
+            exception.addValidationError("value must be a string or an array of strings");
+            return exception;
+        }
+
         return null;
     }
 

x-pack/plugin/fleet/src/test/java/org/elasticsearch/xpack/fleet/action/GetSecretResponseTests.java

@@ -26,10 +26,4 @@ protected GetSecretResponse createTestInstance() {
     protected GetSecretResponse mutateInstance(GetSecretResponse instance) {
         return new GetSecretResponse(instance.id(), randomAlphaOfLength(10));
     }
-
-    public void testValidateResponseWithMultiValue() {
-        String[] secrets = { "secret1", "secret2" };
-        GetSecretResponse res = new GetSecretResponse(randomAlphaOfLength(10), secrets);
-        assertEquals(res.equals(secrets), true);
-    }
 }

x-pack/plugin/fleet/src/test/java/org/elasticsearch/xpack/fleet/action/PostSecretRequestTests.java

@@ -51,4 +51,12 @@ public void testValidateRequestWithoutValue() {
         assertThat(e.validationErrors().size(), equalTo(1));
         assertThat(e.validationErrors().get(0), containsString("value is missing"));
     }
+
+    public void testValidateRequestWithInvalidValue() {
+        PostSecretRequest req = new PostSecretRequest(123);
+        ActionRequestValidationException e = req.validate();
+        assertNotNull(e);
+        assertThat(e.validationErrors().size(), equalTo(1));
+        assertThat(e.validationErrors().get(0), containsString("value must be a string or an array of strings"));
+    }
 }