diff --git a/src/main/java/org/cardanofoundation/signify/app/credentialing/Schemas.java b/src/main/java/org/cardanofoundation/signify/app/credentialing/Schemas.java index 1833e2a..ccc4b51 100644 --- a/src/main/java/org/cardanofoundation/signify/app/credentialing/Schemas.java +++ b/src/main/java/org/cardanofoundation/signify/app/credentialing/Schemas.java @@ -3,10 +3,13 @@ import org.cardanofoundation.signify.app.clienting.SignifyClient; import org.cardanofoundation.signify.cesr.exceptions.LibsodiumException; import org.cardanofoundation.signify.cesr.util.Utils; +import org.cardanofoundation.signify.generated.keria.model.Schema; import java.io.IOException; import java.net.HttpURLConnection; import java.net.http.HttpResponse; +import java.util.Arrays; +import java.util.List; import java.util.Optional; public class Schemas { @@ -30,7 +33,7 @@ public Schemas(SignifyClient client) { * @throws InterruptedException if the operation is interrupted * @throws LibsodiumException if a Sodium error occurs */ - public Optional get(String said) throws IOException, InterruptedException, LibsodiumException { + public Optional get(String said) throws IOException, InterruptedException, LibsodiumException { String path = "/schema/" + said; var method = "GET"; HttpResponse response = this.client.fetch(path, method, null); @@ -39,7 +42,7 @@ public Optional get(String said) throws IOException, InterruptedExceptio return Optional.empty(); } - return Optional.of(Utils.fromJson(response.body(), Object.class)); + return Optional.of(Utils.fromJson(response.body(), Schema.class)); } /** @@ -50,10 +53,10 @@ public Optional get(String said) throws IOException, InterruptedExceptio * @throws InterruptedException if the operation is interrupted * @throws LibsodiumException if a Sodium error occurs */ - public Object list() throws IOException, InterruptedException, LibsodiumException { + public List list() throws IOException, InterruptedException, LibsodiumException { String path = "/schema"; String method = "GET"; HttpResponse response = this.client.fetch(path, method, null); - return Utils.fromJson(response.body(), Object.class); + return Arrays.asList(Utils.fromJson(response.body(), Schema[].class)); } } \ No newline at end of file diff --git a/src/main/java/org/cardanofoundation/signify/app/credentialing/registries/Registries.java b/src/main/java/org/cardanofoundation/signify/app/credentialing/registries/Registries.java index 7201215..0c72578 100644 --- a/src/main/java/org/cardanofoundation/signify/app/credentialing/registries/Registries.java +++ b/src/main/java/org/cardanofoundation/signify/app/credentialing/registries/Registries.java @@ -18,6 +18,7 @@ import java.security.DigestException; import java.util.*; import org.cardanofoundation.signify.generated.keria.model.Identifier; +import org.cardanofoundation.signify.generated.keria.model.Registry; import static org.cardanofoundation.signify.cesr.util.CoreUtil.Versionage; @@ -38,11 +39,11 @@ public Registries(SignifyClient client) { * @throws InterruptedException if the operation is interrupted * @throws LibsodiumException if a sodium exception occurs */ - public Object list(String name) throws IOException, InterruptedException, LibsodiumException { + public List list(String name) throws IOException, InterruptedException, LibsodiumException { String path = "/identifiers/" + name + "/registries"; String method = "GET"; HttpResponse response = this.client.fetch(path, method, null); - return Utils.fromJson(response.body(), Object.class); + return Arrays.asList(Utils.fromJson(response.body(), Registry[].class)); } /** @@ -155,7 +156,7 @@ private HttpResponse createFromEvents( * @throws InterruptedException if the operation is interrupted * @throws LibsodiumException if a sodium exception occurs */ - public Object rename(String name, String registryName, String newName) throws IOException, InterruptedException, LibsodiumException { + public Registry rename(String name, String registryName, String newName) throws IOException, InterruptedException, LibsodiumException { String path = "/identifiers/" + name + "/registries/" + registryName; String method = "PUT"; @@ -163,6 +164,6 @@ public Object rename(String name, String registryName, String newName) throws IO data.put("name", newName); HttpResponse response = this.client.fetch(path, method, data); - return Utils.fromJson(response.body(), Object.class); + return Utils.fromJson(response.body(), Registry.class); } } diff --git a/src/main/java/org/cardanofoundation/signify/generated/keria/model/CredentialState.java b/src/main/java/org/cardanofoundation/signify/generated/keria/model/CredentialState.java index 1a91235..2a0d2d6 100644 --- a/src/main/java/org/cardanofoundation/signify/generated/keria/model/CredentialState.java +++ b/src/main/java/org/cardanofoundation/signify/generated/keria/model/CredentialState.java @@ -78,7 +78,13 @@ public class CredentialState { public enum EtEnum { BIS(String.valueOf("bis")), - BRV(String.valueOf("brv")); + BRV(String.valueOf("brv")), + + VCP(String.valueOf("vcp")), + + ISS(String.valueOf("iss")), + + REV(String.valueOf("rev")); private String value; diff --git a/src/test/java/org/cardanofoundation/signify/e2e/CredentialsTest.java b/src/test/java/org/cardanofoundation/signify/e2e/CredentialsTest.java index 996b834..477224a 100644 --- a/src/test/java/org/cardanofoundation/signify/e2e/CredentialsTest.java +++ b/src/test/java/org/cardanofoundation/signify/e2e/CredentialsTest.java @@ -13,6 +13,8 @@ import org.cardanofoundation.signify.e2e.utils.Retry; import org.cardanofoundation.signify.e2e.utils.TestSteps; import org.cardanofoundation.signify.e2e.utils.TestUtils; +import org.cardanofoundation.signify.generated.keria.model.Registry; +import org.cardanofoundation.signify.generated.keria.model.Schema; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -104,10 +106,9 @@ public void single_signature_credentials() throws Exception { ); }); - HashMap registrys = testSteps.step("Create registry", () -> { + Registry registrys = testSteps.step("Create registry", () -> { String registryName = "vLEI-test-registry"; String updatedRegistryName = "vLEI-test-registry-1"; - HashMap updateRegistry = new HashMap<>(); CreateRegistryArgs registryArgs = CreateRegistryArgs.builder().build(); registryArgs.setName(issuerAid.name); @@ -119,42 +120,31 @@ public void single_signature_credentials() throws Exception { throw new RuntimeException(e); } try { - Object registries = issuerClient.registries().list(issuerAid.name); - List> registriesList = castObjectToListMap(registries); - HashMap registry = new HashMap<>(); - registry.put("name", registriesList.getFirst().get("name").toString()); - registry.put("regk", registriesList.getFirst().get("regk").toString()); + List registriesList = issuerClient.registries().list(issuerAid.name); assertEquals(1, registriesList.size()); - assertEquals(registryName, registry.get("name")); + assertEquals(registryName, registriesList.getFirst().getName()); } catch (IOException | InterruptedException e) { throw new RuntimeException(e); } try { issuerClient.registries().rename(issuerAid.name, registryName, updatedRegistryName); - Object registries = issuerClient.registries().list(issuerAid.name); - List> registriesList = castObjectToListMap(registries); - updateRegistry.put("name", registriesList.getFirst().get("name").toString()); - updateRegistry.put("regk", registriesList.getFirst().get("regk").toString()); + List registriesList = issuerClient.registries().list(issuerAid.name); assertEquals(1, registriesList.size()); - assertEquals(updatedRegistryName, updateRegistry.get("name")); + assertEquals(updatedRegistryName, registriesList.getFirst().getName()); + return registriesList.getFirst(); } catch (IOException | InterruptedException e) { throw new RuntimeException(e); } - return updateRegistry; }); testSteps.step("Issuer can get schemas", () -> { try { - Object issuerQviSchema = issuerClient.schemas().get(QVI_SCHEMA_SAID).get(); - LinkedHashMap issuerQviSchemaList = castObjectToLinkedHashMap(issuerQviSchema); - String issuerQviSchemaID = issuerQviSchemaList.get("$id").toString(); - assertEquals(issuerQviSchemaID, QVI_SCHEMA_SAID); - - Object issuerLeSchema = issuerClient.schemas().get(LE_SCHEMA_SAID).get(); - LinkedHashMap issuerLeSchemaList = castObjectToLinkedHashMap(issuerLeSchema); - String issuerLeSchemaID = issuerLeSchemaList.get("$id").toString(); - assertEquals(issuerLeSchemaID, LE_SCHEMA_SAID); + Schema issuerQviSchema = issuerClient.schemas().get(QVI_SCHEMA_SAID).get(); + assertEquals(QVI_SCHEMA_SAID, issuerQviSchema.get$Id()); + + Schema issuerLeSchema = issuerClient.schemas().get(LE_SCHEMA_SAID).get(); + assertEquals(LE_SCHEMA_SAID, issuerLeSchema.get$Id()); } catch (IOException | InterruptedException | LibsodiumException e) { throw new RuntimeException(e); } @@ -162,8 +152,7 @@ public void single_signature_credentials() throws Exception { testSteps.step("Holder can list schemas", () -> { try { - Object holderSchemas = holderClient.schemas().list(); - List> holderSchemasList = castObjectToListMap(holderSchemas); + List holderSchemasList = holderClient.schemas().list(); assertEquals(2, holderSchemasList.size()); } catch (IOException | InterruptedException | LibsodiumException e) { throw new RuntimeException(e); @@ -179,7 +168,7 @@ public void single_signature_credentials() throws Exception { a.setAdditionalProperties(vcdata); CredentialData cData = CredentialData.builder().build(); - cData.setRi(registrys.get("regk").toString()); + cData.setRi(registrys.getRegk()); cData.setS(QVI_SCHEMA_SAID); cData.setA(a); @@ -292,14 +281,14 @@ public void single_signature_credentials() throws Exception { testSteps.step("Holder can get the credential status before or without holding", () -> { Map state = (Map) Retry.retry(() -> { try { - return holderClient.credentials().state(registrys.get("regk").toString(), qviCredentialId).get(); + return holderClient.credentials().state(registrys.getRegk(), qviCredentialId).get(); } catch (IOException | InterruptedException | LibsodiumException e) { throw new RuntimeException(e); } }); assertEquals(qviCredentialId, state.get("i")); - assertEquals(registrys.get("regk").toString(), state.get("ri")); + assertEquals(registrys.getRegk(), state.get("ri")); assertEquals(CoreUtil.Ilks.ISS.getValue(), state.get("et")); }); @@ -577,7 +566,7 @@ public void single_signature_credentials() throws Exception { } }); - Map holderRegistry = testSteps.step("Holder create registry for LE credential", () -> { + Registry holderRegistry = testSteps.step("Holder create registry for LE credential", () -> { String registryName = "vLEI-test-registry"; CreateRegistryArgs registryArgs = CreateRegistryArgs.builder().build(); registryArgs.setName(holderAid.name); @@ -587,10 +576,9 @@ public void single_signature_credentials() throws Exception { RegistryResult regResult = holderClient.registries().create(registryArgs); waitOperation(holderClient, regResult.op()); - Object registries = holderClient.registries().list(holderAid.name); - List> registriesList = castObjectToListMap(registries); + List registriesList = holderClient.registries().list(holderAid.name); - assertTrue(!registriesList.isEmpty()); + assertFalse(registriesList.isEmpty()); return registriesList.getFirst(); } catch (Exception e) { throw new RuntimeException(e); @@ -630,7 +618,7 @@ public void single_signature_credentials() throws Exception { CredentialData cData = CredentialData.builder().build(); cData.setA(cSubject); - cData.setRi(holderRegistry.get("regk").toString()); + cData.setRi(holderRegistry.getRegk()); cData.setS(LE_SCHEMA_SAID); cData.setR(sad); cData.setE(e); diff --git a/src/test/java/org/cardanofoundation/signify/e2e/MultisigHolderTest.java b/src/test/java/org/cardanofoundation/signify/e2e/MultisigHolderTest.java index e39018e..cf53265 100644 --- a/src/test/java/org/cardanofoundation/signify/e2e/MultisigHolderTest.java +++ b/src/test/java/org/cardanofoundation/signify/e2e/MultisigHolderTest.java @@ -17,6 +17,7 @@ import org.cardanofoundation.signify.generated.keria.model.AidRecord; import org.cardanofoundation.signify.generated.keria.model.GroupMember; import org.cardanofoundation.signify.generated.keria.model.Identifier; +import org.cardanofoundation.signify.generated.keria.model.Registry; import org.cardanofoundation.signify.core.Eventing; import org.cardanofoundation.signify.e2e.utils.MultisigUtils.AcceptMultisigInceptArgs; import org.cardanofoundation.signify.e2e.utils.MultisigUtils.StartMultisigInceptArgs; @@ -42,7 +43,7 @@ public class MultisigHolderTest extends BaseIntegrationTest { Identifier aid1, aid2, aid3; OOBI oobi1, oobi2, oobi3; String oobis1, oobis2, oobis3; - private List> registryList; + private List registryList; ResolveEnv.EnvironmentConfig env = ResolveEnv.resolveEnvironment(null); ArrayList WITNESS_AIDS = new ArrayList<>(Arrays.asList( @@ -404,10 +405,9 @@ void multisigHolderTest() throws Exception { System.out.println("Issuer starting credential issuance to holder..."); - Object registires = client3.registries().list("issuer"); - List> listRegistries = (List>) registires; - Map registryMap = listRegistries.getFirst(); - String regk = registryMap.get("regk").toString(); + List listRegistries = client3.registries().list("issuer"); + Registry registry = listRegistries.getFirst(); + String regk = registry.getRegk(); CredentialSubject subject = CredentialSubject.builder() .i(holderAid.getPrefix()) @@ -502,7 +502,7 @@ public Identifier createAid(SignifyClient client, String name, List wits return aid; } - public Object createRegistry(SignifyClient client, String name, String registryName) throws Exception { + public Registry createRegistry(SignifyClient client, String name, String registryName) throws Exception { CreateRegistryArgs args = CreateRegistryArgs.builder() .name(name) .registryName(registryName) @@ -512,13 +512,12 @@ public Object createRegistry(SignifyClient client, String name, String registryN Object op = result.op(); waitOperation(client, op); - Object registries = client.registries().list(name); - registryList = (List>) registries; - HashMap opResponseName = registryList.getFirst(); + registryList = client.registries().list(name); + Registry registry = registryList.getFirst(); assertEquals(1, registryList.size()); - assertEquals(registryName, opResponseName.get("name")); - return opResponseName; + assertEquals(registryName, registry.getName()); + return registry; } public Object issueCredential( diff --git a/src/test/java/org/cardanofoundation/signify/e2e/MultisigVleiIssuanaceTest.java b/src/test/java/org/cardanofoundation/signify/e2e/MultisigVleiIssuanaceTest.java index 30a823b..e045754 100644 --- a/src/test/java/org/cardanofoundation/signify/e2e/MultisigVleiIssuanaceTest.java +++ b/src/test/java/org/cardanofoundation/signify/e2e/MultisigVleiIssuanaceTest.java @@ -14,6 +14,7 @@ import org.cardanofoundation.signify.generated.keria.model.Identifier; import org.cardanofoundation.signify.generated.keria.model.KeyStateRecord; import org.cardanofoundation.signify.generated.keria.model.OOBI; +import org.cardanofoundation.signify.generated.keria.model.Registry; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -510,8 +511,8 @@ void testMultisigVleiIssuance() throws Exception { // GARs creates a registry for GEDA. // Skip if the registry has already been created. - List> gedaRegistrybyGAR1 = (List>) clientGAR1.registries().list(aidGEDA.getName()); - List> gedaRegistrybyGAR2 = (List>) clientGAR2.registries().list(aidGEDA.getName()); + List gedaRegistrybyGAR1 = clientGAR1.registries().list(aidGEDA.getName()); + List gedaRegistrybyGAR2 = clientGAR2.registries().list(aidGEDA.getName()); if (gedaRegistrybyGAR1.size() == 0 && gedaRegistrybyGAR2.size() == 0) { String nonce = Coring.randomNonce(); @@ -541,13 +542,13 @@ void testMultisigVleiIssuance() throws Exception { ); TestUtils.waitAndMarkNotification(clientGAR1, "/multisig/vcp"); - gedaRegistrybyGAR1 = (List>) clientGAR1.registries().list(aidGEDA.getName()); - gedaRegistrybyGAR2 = (List>) clientGAR2.registries().list(aidGEDA.getName()); + gedaRegistrybyGAR1 = clientGAR1.registries().list(aidGEDA.getName()); + gedaRegistrybyGAR2 = clientGAR2.registries().list(aidGEDA.getName()); } - assertEquals(gedaRegistrybyGAR1.get(0).get("name"), gedaRegistrybyGAR2.get(0).get("name")); - assertEquals(gedaRegistrybyGAR1.get(0).get("regk"), gedaRegistrybyGAR2.get(0).get("regk")); + assertEquals(gedaRegistrybyGAR1.get(0).getName(), gedaRegistrybyGAR2.get(0).getName()); + assertEquals(gedaRegistrybyGAR1.get(0).getRegk(), gedaRegistrybyGAR2.get(0).getRegk()); - Map gedaRegistry = gedaRegistrybyGAR1.get(0); + Registry gedaRegistry = gedaRegistrybyGAR1.get(0); // GEDA issues a QVI vLEI credential to the QVI AID. // Skip if the credential has already been issued. Map qviCredbyGAR1 = (Map) TestUtils.getIssuedCredential( @@ -573,7 +574,7 @@ void testMultisigVleiIssuance() throws Exception { CredentialData kargsIss = CredentialData.builder() .i(aidGEDA.getPrefix()) - .ri(gedaRegistry.get("regk").toString()) + .ri(gedaRegistry.getRegk()) .s(QVI_SCHEMA_SAID) .a(kargsSub) .build(); @@ -865,9 +866,9 @@ void testMultisigVleiIssuance() throws Exception { // QARs creates a registry for QVI AID. // Skip if the registry has already been created. - List qviRegistrybyQAR1 = (List) clientQAR1.registries().list(aidQVI.getName()); - List qviRegistrybyQAR2 = (List) clientQAR2.registries().list(aidQVI.getName()); - List qviRegistrybyQAR3 = (List) clientQAR3.registries().list(aidQVI.getName()); + List qviRegistrybyQAR1 = clientQAR1.registries().list(aidQVI.getName()); + List qviRegistrybyQAR2 = clientQAR2.registries().list(aidQVI.getName()); + List qviRegistrybyQAR3 = clientQAR3.registries().list(aidQVI.getName()); if (qviRegistrybyQAR1.size() == 0 || qviRegistrybyQAR2.size() == 0 || qviRegistrybyQAR3.size() == 0) { String nonce = Coring.randomNonce(); Object registryOp1 = MultisigUtils.createRegistryMultisig( @@ -907,16 +908,16 @@ void testMultisigVleiIssuance() throws Exception { ); TestUtils.waitAndMarkNotification(clientQAR1, "/multisig/vcp"); - qviRegistrybyQAR1 = (List) clientQAR1.registries().list(aidQVI.getName()); - qviRegistrybyQAR2 = (List) clientQAR2.registries().list(aidQVI.getName()); - qviRegistrybyQAR3 = (List) clientQAR3.registries().list(aidQVI.getName()); + qviRegistrybyQAR1 = clientQAR1.registries().list(aidQVI.getName()); + qviRegistrybyQAR2 = clientQAR2.registries().list(aidQVI.getName()); + qviRegistrybyQAR3 = clientQAR3.registries().list(aidQVI.getName()); } - assertEquals(castObjectToLinkedHashMap(qviRegistrybyQAR1.get(0)).get("name"), castObjectToLinkedHashMap(qviRegistrybyQAR2.get(0)).get("name")); - assertEquals(castObjectToLinkedHashMap(qviRegistrybyQAR1.get(0)).get("name"), castObjectToLinkedHashMap(qviRegistrybyQAR3.get(0)).get("name")); - assertEquals(castObjectToLinkedHashMap(qviRegistrybyQAR1.get(0)).get("regk"), castObjectToLinkedHashMap(qviRegistrybyQAR2.get(0)).get("regk")); - assertEquals(castObjectToLinkedHashMap(qviRegistrybyQAR1.get(0)).get("regk"), castObjectToLinkedHashMap(qviRegistrybyQAR3.get(0)).get("regk")); + assertEquals(qviRegistrybyQAR1.get(0).getName(), qviRegistrybyQAR2.get(0).getName()); + assertEquals(qviRegistrybyQAR1.get(0).getName(), qviRegistrybyQAR3.get(0).getName()); + assertEquals(qviRegistrybyQAR1.get(0).getRegk(), qviRegistrybyQAR2.get(0).getRegk()); + assertEquals(qviRegistrybyQAR1.get(0).getRegk(), qviRegistrybyQAR3.get(0).getRegk()); - Map qviRegistry = castObjectToLinkedHashMap(qviRegistrybyQAR1.get(0)); + Registry qviRegistry = qviRegistrybyQAR1.get(0); // QVI issues a LE vLEI credential to the LE. // Skip if the credential has already been issued. @@ -960,7 +961,7 @@ void testMultisigVleiIssuance() throws Exception { CredentialData kargsIss = CredentialData.builder() .i(aidQVI.getPrefix()) - .ri(qviRegistry.get("regk").toString()) + .ri(qviRegistry.getRegk()) .s(LE_SCHEMA_SAID) .a(kargsSub) .e(leCredSource) @@ -1129,9 +1130,9 @@ void testMultisigVleiIssuance() throws Exception { // LARs creates a registry for LE AID. // Skip if the registry has already been created. - List leRegistrybyLAR1 = (List) clientLAR1.registries().list(aidLE.getName()); - List leRegistrybyLAR2 = (List) clientLAR2.registries().list(aidLE.getName()); - List leRegistrybyLAR3 = (List) clientLAR3.registries().list(aidLE.getName()); + List leRegistrybyLAR1 = clientLAR1.registries().list(aidLE.getName()); + List leRegistrybyLAR2 = clientLAR2.registries().list(aidLE.getName()); + List leRegistrybyLAR3 = clientLAR3.registries().list(aidLE.getName()); if (leRegistrybyLAR1.isEmpty() && leRegistrybyLAR2.isEmpty() && leRegistrybyLAR3.isEmpty()) { String nonce = Coring.randomNonce(); @@ -1172,16 +1173,16 @@ void testMultisigVleiIssuance() throws Exception { ); TestUtils.waitAndMarkNotification(clientLAR1, "/multisig/vcp"); - leRegistrybyLAR1 = (List) clientLAR1.registries().list(aidLE.getName()); - leRegistrybyLAR2 = (List) clientLAR2.registries().list(aidLE.getName()); - leRegistrybyLAR3 = (List) clientLAR3.registries().list(aidLE.getName()); + leRegistrybyLAR1 = clientLAR1.registries().list(aidLE.getName()); + leRegistrybyLAR2 = clientLAR2.registries().list(aidLE.getName()); + leRegistrybyLAR3 = clientLAR3.registries().list(aidLE.getName()); } - assertEquals(castObjectToLinkedHashMap(leRegistrybyLAR1.get(0)).get("name"), castObjectToLinkedHashMap(leRegistrybyLAR2.get(0)).get("name")); - assertEquals(castObjectToLinkedHashMap(leRegistrybyLAR1.get(0)).get("name"), castObjectToLinkedHashMap(leRegistrybyLAR3.get(0)).get("name")); - assertEquals(castObjectToLinkedHashMap(leRegistrybyLAR1.get(0)).get("regk"), castObjectToLinkedHashMap(leRegistrybyLAR2.get(0)).get("regk")); - assertEquals(castObjectToLinkedHashMap(leRegistrybyLAR1.get(0)).get("regk"), castObjectToLinkedHashMap(leRegistrybyLAR3.get(0)).get("regk")); + assertEquals(leRegistrybyLAR1.get(0).getName(), leRegistrybyLAR2.get(0).getName()); + assertEquals(leRegistrybyLAR1.get(0).getName(), leRegistrybyLAR3.get(0).getName()); + assertEquals(leRegistrybyLAR1.get(0).getRegk(), leRegistrybyLAR2.get(0).getRegk()); + assertEquals(leRegistrybyLAR1.get(0).getRegk(), leRegistrybyLAR3.get(0).getRegk()); - Map leRegistry = castObjectToLinkedHashMap(leRegistrybyLAR1.get(0)); + Registry leRegistry = leRegistrybyLAR1.get(0); // LE issues a ECR vLEI credential to the ECR Person. // Skip if the credential has already been issued. @@ -1225,7 +1226,7 @@ void testMultisigVleiIssuance() throws Exception { CredentialData kargsIss = CredentialData.builder() .u(new Salter().getQb64()) .i(aidLE.getPrefix()) - .ri(leRegistry.get("regk").toString()) + .ri(leRegistry.getRegk()) .s(ECR_SCHEMA_SAID) .a(kargsSub) .e(ecrCredSource) diff --git a/src/test/java/org/cardanofoundation/signify/e2e/SinglesigVleiIssuanceTest.java b/src/test/java/org/cardanofoundation/signify/e2e/SinglesigVleiIssuanceTest.java index b0396b8..214fb2e 100644 --- a/src/test/java/org/cardanofoundation/signify/e2e/SinglesigVleiIssuanceTest.java +++ b/src/test/java/org/cardanofoundation/signify/e2e/SinglesigVleiIssuanceTest.java @@ -11,6 +11,7 @@ import org.cardanofoundation.signify.e2e.utils.ResolveEnv; import org.cardanofoundation.signify.e2e.utils.Retry; import org.cardanofoundation.signify.e2e.utils.TestUtils; +import org.cardanofoundation.signify.generated.keria.model.Registry; import org.junit.jupiter.api.Test; import java.util.*; @@ -558,10 +559,9 @@ public void singlesig_vlei_issuance() throws Exception { public IssuerRegistry getOrCreateRegistry(SignifyClient client, Aid aid, String registryName) throws Exception { IssuerRegistry registry = IssuerRegistry.builder().build(); - Object registries = client.registries().list(aid.name); - ArrayList registriesBody = (ArrayList) registries; - if (!registriesBody.isEmpty()) { - assertEquals(1, registriesBody.size()); + List registries = client.registries().list(aid.name); + if (!registries.isEmpty()) { + assertEquals(1, registries.size()); } else { CreateRegistryArgs registryArgs = CreateRegistryArgs.builder().build(); registryArgs.setName(aid.name); @@ -571,10 +571,9 @@ public IssuerRegistry getOrCreateRegistry(SignifyClient client, Aid aid, String waitOperation(client, regResult.op()); registries = client.registries().list(aid.name); - registriesBody = (ArrayList) registries; - LinkedHashMap registryBody = castObjectToLinkedHashMap(registriesBody.getFirst()); - registry.setName(registryBody.get("name").toString()); - registry.setRegk(registryBody.get("regk").toString()); + Registry registryBody = registries.getFirst(); + registry.setName(registryBody.getName()); + registry.setRegk(registryBody.getRegk()); } return registry; }