Move authz package into identity

Signed-off-by: Craig Perkins <[email protected]>
opensearch-project · Sep 27, 2022 · 2bf5401 · 2bf5401
1 parent 7182afb
commit 2bf5401
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/...pensearch/authz/AuthorizationRequest.java → .../identity/authz/AuthorizationRequest.java b/...pensearch/authz/AuthorizationRequest.java → .../identity/authz/AuthorizationRequest.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.authz;
+package org.opensearch.identity.authz;
 
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;

diff --git a/...ensearch/authz/AuthorizationResponse.java → ...identity/authz/AuthorizationResponse.java b/...ensearch/authz/AuthorizationResponse.java → ...identity/authz/AuthorizationResponse.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.authz;
+package org.opensearch.identity.authz;
 
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -20,28 +20,28 @@
  * @opensearch.experimental
  */
 public class AuthorizationResponse extends TransportResponse {
-    private String response;
+    private String message;
 
     private AuthorizationStatus authStatus;
 
-    public AuthorizationResponse(String response, AuthorizationStatus authStatus) {
-        this.response = response;
+    public AuthorizationResponse(String message, AuthorizationStatus authStatus) {
+        this.message = message;
         this.authStatus = authStatus;
     }
 
     public AuthorizationResponse(StreamInput in) throws IOException {
-        response = in.readString();
+        message = in.readString();
         authStatus = in.readEnum(AuthorizationStatus.class);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeString(response);
+        out.writeString(message);
         out.writeEnum(authStatus);
     }
 
-    public String getResponse() {
-        return response;
+    public String getMessage() {
+        return message;
     }
 
     public AuthorizationStatus getAuthStatus() {

diff --git a/...opensearch/authz/AuthorizationStatus.java → ...h/identity/authz/AuthorizationStatus.java b/...opensearch/authz/AuthorizationStatus.java → ...h/identity/authz/AuthorizationStatus.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.authz;
+package org.opensearch.identity.authz;
 
 /**
  * Status code for an AuthorizationResponse

diff --git a/.../opensearch/authz/CheckableParameter.java → ...ch/identity/authz/CheckableParameter.java b/.../opensearch/authz/CheckableParameter.java → ...ch/identity/authz/CheckableParameter.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.authz;
+package org.opensearch.identity.authz;
 
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -71,6 +71,7 @@ public static CheckableParameter readParameterFromStream(StreamInput in) throws
         String key = in.readString();
         String className = in.readString();
         Object value = in.readGenericValue();
+        // Potential performance improvement for Class.forName(...) - https://stackoverflow.com/q/18231991/533057
         return new CheckableParameter(key, value, Class.forName(className));
     }
 
@@ -82,6 +83,6 @@ public static void writeParameterToStream(CheckableParameter param, StreamOutput
 
     @Override
     public String toString() {
-        return "CheckableParameter{key=" + key + ", value=" + value + "}";
+        return "CheckableParameter{key=" + key + ", value=" + value + ", type=" + type + "}";
     }
 }
diff --git a/.../opensearch/authz/WriteableParameter.java → ...ch/identity/authz/WriteableParameter.java b/.../opensearch/authz/WriteableParameter.java → ...ch/identity/authz/WriteableParameter.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.authz;
+package org.opensearch.identity.authz;
 
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;

diff --git a/...va/org/opensearch/authz/package-info.java → ...ensearch/identity/authz/package-info.java b/...va/org/opensearch/authz/package-info.java → ...ensearch/identity/authz/package-info.java
@@ -11,4 +11,4 @@
  *
  * @opensearch.experimental
  */
-package org.opensearch.authz;
+package org.opensearch.identity.authz;
diff --git a/...search/authz/CheckableParameterTests.java → ...entity/authz/CheckableParameterTests.java b/...search/authz/CheckableParameterTests.java → ...entity/authz/CheckableParameterTests.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.authz;
+package org.opensearch.identity.authz;
 
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.io.stream.StreamInput;

diff --git a/...search/authz/WriteableParameterTests.java → ...entity/authz/WriteableParameterTests.java b/...search/authz/WriteableParameterTests.java → ...entity/authz/WriteableParameterTests.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.authz;
+package org.opensearch.identity.authz;
 
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamInput;