From bba700c2118473ab72a86100cf38a4c6b368b557 Mon Sep 17 00:00:00 2001
From: TomFitzpatrick <tom.fitzpatrick@r3.com>
Date: Tue, 19 Dec 2023 12:04:07 +0000
Subject: [PATCH] replace two password change kafka payloads with one

Signed-off-by: TomFitzpatrick <tom.fitzpatrick@r3.com>
---
 .../PermissionManagementRequest.avsc          |  3 +-
 ...st.avsc => ChangeUserPasswordRequest.avsc} |  2 +-
 .../user/ChangeUserPasswordSelfRequest.avsc   | 30 -------------------
 3 files changed, 2 insertions(+), 33 deletions(-)
 rename data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/{ChangeUserPasswordOtherRequest.avsc => ChangeUserPasswordRequest.avsc} (93%)
 delete mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserPasswordSelfRequest.avsc

diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc
index c12eabd6f4..a11d7ecb99 100644
--- a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc
+++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc
@@ -20,8 +20,7 @@
       "name": "request",
       "type": [
         "net.corda.data.permissions.management.user.CreateUserRequest",
-        "net.corda.data.permissions.management.user.ChangeUserPasswordSelfRequest",
-        "net.corda.data.permissions.management.user.ChangeUserPasswordOtherRequest",
+        "net.corda.data.permissions.management.user.ChangeUserPasswordRequest",
         "net.corda.data.permissions.management.user.AddRoleToUserRequest",
         "net.corda.data.permissions.management.user.RemoveRoleFromUserRequest",
         "net.corda.data.permissions.management.role.CreateRoleRequest",
diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserPasswordOtherRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserPasswordRequest.avsc
similarity index 93%
rename from data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserPasswordOtherRequest.avsc
rename to data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserPasswordRequest.avsc
index a25d1ab901..d1d715d811 100644
--- a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserPasswordOtherRequest.avsc
+++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserPasswordRequest.avsc
@@ -1,6 +1,6 @@
 {
   "type": "record",
-  "name": "ChangeUserPasswordOtherRequest",
+  "name": "ChangeUserPasswordRequest",
   "namespace": "net.corda.data.permissions.management.user",
   "fields": [
     {
diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserPasswordSelfRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserPasswordSelfRequest.avsc
deleted file mode 100644
index 307c775eb3..0000000000
--- a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserPasswordSelfRequest.avsc
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "type": "record",
-  "name": "ChangeUserPasswordSelfRequest",
-  "namespace": "net.corda.data.permissions.management.user",
-  "fields": [
-    {
-      "name": "requestedBy",
-      "type": "string"
-    },
-    {
-      "name": "saltValue",
-      "type": [ "null", "string" ]
-    },
-    {
-      "name": "hashedNewPassword",
-      "type": "string"
-    },
-    {
-      "name": "passwordExpiry",
-      "type": [
-        "null",
-        {
-          "type": "long",
-          "logicalType": "timestamp-millis"
-        }
-      ],
-      "doc": "Time ([Instant]) in milliseconds when the user's password expires."
-    }
-  ]
-}