From d36ba057825b3786d1ba51e4e6dc79ab46198c09 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Mon, 22 Apr 2024 16:03:22 -0400 Subject: [PATCH 1/8] Invert the metadata and content API endpoints for versions --- app/.gitignore | 1 + .../registry/rest/v3/GroupsResourceImpl.java | 4 +- .../registry/auth/SimpleAuthTest.java | 6 +- .../apicurio/registry/limits/LimitsTest.java | 2 - .../registry/noprofile/VersionStateTest.java | 32 ++--- .../RegistryMojoWithAutoReferencesTest.java | 5 +- .../maven/RegistryMojoWithMinifyTest.java | 4 +- .../rest/v3/CustomizeDateFormatTest.java | 2 +- .../noprofile/rest/v3/GroupsResourceTest.java | 87 ++++-------- .../noprofile/rest/v3/IdsResourceTest.java | 6 +- .../noprofile/serde/AvroSerdeTest.java | 4 +- .../noprofile/serde/JsonSchemaSerdeTest.java | 2 +- .../noprofile/serde/ProtobufSerdeTest.java | 2 +- .../registry/rbac/AdminResourceTest.java | 2 +- .../registry/rbac/RegistryClientTest.java | 36 ++--- .../registry/rest/DisableApisFlagsTest.java | 4 +- .../src/main/resources/META-INF/openapi.json | 132 +++++++++--------- ...m_versions_item_content_request_builder.go | 86 ++++++++++++ ...item_versions_item_meta_request_builder.go | 113 --------------- ...version_expression_item_request_builder.go | 75 ++++++---- go-sdk/pkg/registryclient-v3/kiota-lock.json | 2 +- .../tests/ApicurioRegistryBaseIT.java | 2 +- .../io/apicurio/tests/auth/SimpleAuthIT.java | 4 +- .../migration/DoNotPreserveIdsImportIT.java | 2 +- .../GenerateCanonicalHashImportIT.java | 2 +- .../tests/serdes/apicurio/AvroSerdeIT.java | 18 +-- .../serdes/apicurio/ProtobufSerdeIT.java | 8 +- .../smokeTests/apicurio/ArtifactsIT.java | 36 ++--- .../tests/smokeTests/apicurio/MetadataIT.java | 8 +- .../confluent/SchemasConfluentIT.java | 2 +- .../resolver/AbstractSchemaResolver.java | 2 +- .../resolver/DefaultSchemaResolver.java | 2 +- .../registry/maven/DownloadRegistryMojo.java | 2 +- .../registry/maven/RegisterRegistryMojo.java | 2 +- 34 files changed, 336 insertions(+), 361 deletions(-) create mode 100644 app/.gitignore create mode 100644 go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_item_content_request_builder.go delete mode 100644 go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_item_meta_request_builder.go diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000000..b83d22266a --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/app/src/main/java/io/apicurio/registry/rest/v3/GroupsResourceImpl.java b/app/src/main/java/io/apicurio/registry/rest/v3/GroupsResourceImpl.java index 3dcfa8db6f..33e2b6dd1c 100644 --- a/app/src/main/java/io/apicurio/registry/rest/v3/GroupsResourceImpl.java +++ b/app/src/main/java/io/apicurio/registry/rest/v3/GroupsResourceImpl.java @@ -453,11 +453,11 @@ public void testUpdateArtifact(String groupId, String artifactId, InputStream da } /** - * @see io.apicurio.registry.rest.v3.GroupsResource#getArtifactVersion(java.lang.String, java.lang.String, java.lang.String, io.apicurio.registry.rest.v3.beans.HandleReferencesType) + * @see io.apicurio.registry.rest.v3.GroupsResource#getArtifactVersionContent(java.lang.String, java.lang.String, java.lang.String, io.apicurio.registry.rest.v3.beans.HandleReferencesType) */ @Override @Authorized(style = AuthorizedStyle.GroupAndArtifact, level = AuthorizedLevel.Read) - public Response getArtifactVersion(String groupId, String artifactId, String versionExpression, HandleReferencesType references) { + public Response getArtifactVersionContent(String groupId, String artifactId, String versionExpression, HandleReferencesType references) { requireParameter("groupId", groupId); requireParameter("artifactId", artifactId); requireParameter("versionExpression", versionExpression); diff --git a/app/src/test/java/io/apicurio/registry/auth/SimpleAuthTest.java b/app/src/test/java/io/apicurio/registry/auth/SimpleAuthTest.java index 3e8637178e..24270c53e0 100644 --- a/app/src/test/java/io/apicurio/registry/auth/SimpleAuthTest.java +++ b/app/src/test/java/io/apicurio/registry/auth/SimpleAuthTest.java @@ -137,7 +137,7 @@ public void testDevRole() throws Exception { }); TestUtils.retry(() -> client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).get()); - assertTrue(client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get().readAllBytes().length > 0); + assertTrue(client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get().readAllBytes().length > 0); Rule ruleConfig = new Rule(); ruleConfig.setType(RuleType.VALIDITY); @@ -175,7 +175,7 @@ public void testAdminRole() throws Exception { }); TestUtils.retry(() -> client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).get()); - assertTrue(client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get().readAllBytes().length > 0); + assertTrue(client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get().readAllBytes().length > 0); Rule ruleConfig = new Rule(); ruleConfig.setType(RuleType.VALIDITY); @@ -210,7 +210,7 @@ public void testAdminRoleBasicAuth() throws Exception { }); TestUtils.retry(() -> client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).get()); - assertTrue(client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get().readAllBytes().length > 0); + assertTrue(client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get().readAllBytes().length > 0); Rule ruleConfig = new Rule(); ruleConfig.setType(RuleType.VALIDITY); diff --git a/app/src/test/java/io/apicurio/registry/limits/LimitsTest.java b/app/src/test/java/io/apicurio/registry/limits/LimitsTest.java index 19f2a590a5..486b1349aa 100644 --- a/app/src/test/java/io/apicurio/registry/limits/LimitsTest.java +++ b/app/src/test/java/io/apicurio/registry/limits/LimitsTest.java @@ -73,7 +73,6 @@ public void testLimits() throws Exception { .byArtifactId(artifactId) .versions() .byVersionExpression("1") - .meta() .put(meta) ; @@ -95,7 +94,6 @@ public void testLimits() throws Exception { .byArtifactId(artifactId) .versions() .byVersionExpression("1") - .meta() .put(invalidmeta) ; }); diff --git a/app/src/test/java/io/apicurio/registry/noprofile/VersionStateTest.java b/app/src/test/java/io/apicurio/registry/noprofile/VersionStateTest.java index d528a43c6f..9d619a48e1 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/VersionStateTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/VersionStateTest.java @@ -42,27 +42,27 @@ public void testSmoke() throws Exception { content.setContent("{\"type\": \"float\"}"); clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().post(content); - VersionMetaData amd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData amd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); Assertions.assertEquals("3", amd.getVersion()); // disable latest EditableVersionMetaData evmd = toEditableVersionMetaData(VersionState.DISABLED); - clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(amd.getVersion()).meta().put(evmd); + clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(amd.getVersion()).put(evmd); - VersionMetaData tvmd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").meta().get(); + VersionMetaData tvmd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").get(); Assertions.assertEquals("3", tvmd.getVersion()); Assertions.assertEquals(VersionState.DISABLED, tvmd.getState()); // Latest artifact version (3) is disabled, this will return a previous version - VersionMetaData tamd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData tamd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); Assertions.assertEquals("2", tamd.getVersion()); Assertions.assertNull(tamd.getDescription()); - // cannot get a disabled artifact version + // cannot get a disabled artifact version *content* var exception = assertThrows(io.apicurio.registry.rest.client.models.Error.class, () -> { - clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").get(); + clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").content().get(); }); Assertions.assertEquals(404, exception.getErrorCode()); Assertions.assertEquals("VersionNotFoundException", exception.getName()); @@ -71,42 +71,42 @@ public void testSmoke() throws Exception { EditableVersionMetaData emd = new EditableVersionMetaData(); String description = "Testing artifact state"; emd.setDescription(description); - clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").meta().put(emd); + clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").put(emd); { - VersionMetaData innerAvmd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").meta().get(); + VersionMetaData innerAvmd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").get(); Assertions.assertEquals("3", innerAvmd.getVersion()); Assertions.assertEquals(description, innerAvmd.getDescription()); } - clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").meta().put(toEditableVersionMetaData(VersionState.DEPRECATED)); + clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").put(toEditableVersionMetaData(VersionState.DEPRECATED)); - tamd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + tamd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); Assertions.assertEquals("3", tamd.getVersion()); // should be back to v3 Assertions.assertEquals(tamd.getDescription(), description); - InputStream latestArtifact = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); + InputStream latestArtifact = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get(); Assertions.assertNotNull(latestArtifact); latestArtifact.close(); - InputStream version = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("2").get(); + InputStream version = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("2").content().get(); Assertions.assertNotNull(version); version.close(); { - VersionMetaData innerAmd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData innerAmd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); Assertions.assertEquals("3", innerAmd.getVersion()); Assertions.assertEquals(description, innerAmd.getDescription()); } // can revert back to enabled from deprecated - clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").meta().put(toEditableVersionMetaData(VersionState.ENABLED)); + clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").put(toEditableVersionMetaData(VersionState.ENABLED)); { - VersionMetaData innerAmd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData innerAmd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); Assertions.assertEquals("3", innerAmd.getVersion()); // should still be latest (aka 3) Assertions.assertEquals(description, innerAmd.getDescription()); - VersionMetaData innerVmd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").meta().get(); + VersionMetaData innerVmd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").get(); Assertions.assertNull(innerVmd.getDescription()); } } diff --git a/app/src/test/java/io/apicurio/registry/noprofile/maven/RegistryMojoWithAutoReferencesTest.java b/app/src/test/java/io/apicurio/registry/noprofile/maven/RegistryMojoWithAutoReferencesTest.java index 0bb7e53b3e..13bc479841 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/maven/RegistryMojoWithAutoReferencesTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/maven/RegistryMojoWithAutoReferencesTest.java @@ -152,7 +152,7 @@ public void autoRegisterJsonSchemaWithReferences() throws Exception { } private void validateStructure(String groupId, String artifactId, int expectedMainReferences, int expectedTotalArtifacts, Set originalContents) throws Exception { - final VersionMetaData artifactWithReferences = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + final VersionMetaData artifactWithReferences = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); final String mainContent = new String( clientV3 @@ -162,6 +162,7 @@ private void validateStructure(String groupId, String artifactId, int expectedMa .byArtifactId(artifactId) .versions() .byVersionExpression(artifactWithReferences.getVersion()) + .content() .get() .readAllBytes(), StandardCharsets.UTF_8); @@ -189,6 +190,7 @@ private void validateReferences(List artifactReferences, Set< .byArtifactId(artifactReference.getArtifactId()) .versions() .byVersionExpression(artifactReference.getVersion()) + .content() .get() .readAllBytes(), StandardCharsets.UTF_8); VersionMetaData referenceMetadata = clientV3 @@ -198,7 +200,6 @@ private void validateReferences(List artifactReferences, Set< .byArtifactId(artifactReference.getArtifactId()) .versions() .byVersionExpression("branch=latest") - .meta() .get() ; Assertions.assertTrue(loadedContents.contains(referenceContent.trim())); diff --git a/app/src/test/java/io/apicurio/registry/noprofile/maven/RegistryMojoWithMinifyTest.java b/app/src/test/java/io/apicurio/registry/noprofile/maven/RegistryMojoWithMinifyTest.java index bc6bed78f0..f573466b49 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/maven/RegistryMojoWithMinifyTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/maven/RegistryMojoWithMinifyTest.java @@ -47,12 +47,12 @@ public void testMinify() throws Exception { registerMojo.execute(); // Wait for the artifact to be created. - InputStream artifactInputStream = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId("userInfoMinified").versions().byVersionExpression("branch=latest").get(); + InputStream artifactInputStream = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId("userInfoMinified").versions().byVersionExpression("branch=latest").content().get(); String artifactContent = new String(artifactInputStream.readAllBytes(), StandardCharsets.UTF_8); Assertions.assertEquals("{\"type\":\"record\",\"name\":\"userInfo\",\"namespace\":\"my.example\",\"fields\":[{\"name\":\"age\",\"type\":\"int\"}]}", artifactContent); // Wait for the artifact to be created. - artifactInputStream = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId("userInfoNotMinified").versions().byVersionExpression("branch=latest").get(); + artifactInputStream = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId("userInfoNotMinified").versions().byVersionExpression("branch=latest").content().get(); artifactContent = new String(artifactInputStream.readAllBytes(), StandardCharsets.UTF_8); Assertions.assertEquals("{\n" + " \"type\" : \"record\",\n" + diff --git a/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/CustomizeDateFormatTest.java b/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/CustomizeDateFormatTest.java index 5a49b2b57d..9839b1c2c5 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/CustomizeDateFormatTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/CustomizeDateFormatTest.java @@ -41,7 +41,7 @@ public void testOpenApiCompliantDateFormat() throws Exception { .when() .pathParam("groupId", GROUP) .pathParam("artifactId", "testGetArtifactMetaData/EmptyAPI") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/meta") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") .then() .statusCode(200) .body("createdOn", new BaseMatcher() { diff --git a/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/GroupsResourceTest.java b/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/GroupsResourceTest.java index 2693fd8a95..286718c093 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/GroupsResourceTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/GroupsResourceTest.java @@ -12,7 +12,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalToObject; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.startsWith; @@ -120,20 +119,11 @@ public void testDefaultGroup() throws Exception { .when() .pathParam("groupId", defaultGroup) .pathParam("artifactId", "testDefaultGroup/EmptyAPI/1") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) .body("info.title", equalTo("Empty API")); - given() - .when() - .pathParam("groupId", group) - .pathParam("artifactId", "testDefaultGroup/EmptyAPI/1") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") - .then() - .statusCode(200) - .body("openapi", not(equalTo("3.0.2"))) - .body("info.title", not(equalTo("Empty API"))); } @Test @@ -283,20 +273,11 @@ public void testMultipleGroups() throws Exception { .when() .pathParam("groupId", group1) .pathParam("artifactId", "testMultipleGroups/EmptyAPI/1") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) .body("info.title", equalTo("Empty API")); - given() - .when() - .pathParam("groupId", group2) - .pathParam("artifactId", "testMultipleGroups/EmptyAPI/1") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") - .then() - .statusCode(200) - .body("openapi", not(equalTo("3.0.2"))) - .body("info.title", not(equalTo("Empty API"))); //Test delete group operations // Delete group 1 metadata @@ -520,7 +501,7 @@ public void testGetArtifact() throws Exception { .when() .pathParam("groupId", GROUP) .pathParam("artifactId", "testGetArtifact/EmptyAPI") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -565,7 +546,7 @@ public void testUpdateArtifact() throws Exception { .when() .pathParam("groupId", GROUP) .pathParam("artifactId", "testUpdateArtifact/EmptyAPI") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -662,7 +643,7 @@ public void testUpdateVersionState() throws Exception { .pathParam("groupId", "testUpdateVersionState") .pathParam("artifactId", "testUpdateVersionState/EmptyAPI/1") .body(body) - .put("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/meta") + .put("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") .then() .statusCode(204); @@ -673,7 +654,7 @@ public void testUpdateVersionState() throws Exception { .pathParam("groupId", "testUpdateVersionState") .pathParam("artifactId", "testUpdateVersionState/EmptyAPI/1") .body(body) - .put("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/meta") + .put("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") .then() .statusCode(204); @@ -683,7 +664,7 @@ public void testUpdateVersionState() throws Exception { .contentType(CT_JSON) .pathParam("groupId", "testUpdateVersionState") .pathParam("artifactId", "testUpdateVersionState/EmptyAPI/1") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .header("X-Registry-Deprecated", "true"); @@ -705,7 +686,7 @@ public void testUpdateArtifactVersionState() throws Exception { .pathParam("artifactId", "testUpdateArtifactVersionState/EmptyAPI") .pathParam("versionId", "1") .body(body) - .put("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{versionId}/meta") + .put("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{versionId}") .then() .statusCode(204); @@ -717,7 +698,7 @@ public void testUpdateArtifactVersionState() throws Exception { .pathParam("artifactId", "testUpdateArtifactVersionState/EmptyAPI") .pathParam("versionId", "1") .body(body) - .put("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{versionId}/meta") + .put("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{versionId}") .then() .statusCode(204); @@ -728,7 +709,7 @@ public void testUpdateArtifactVersionState() throws Exception { .pathParam("groupId", "testUpdateArtifactVersionState") .pathParam("artifactId", "testUpdateArtifactVersionState/EmptyAPI") .pathParam("versionId", "1") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{versionId}") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{versionId}/content") .then() .statusCode(200) .header("X-Registry-Deprecated", "true"); @@ -806,7 +787,7 @@ public void testDeleteArtifact() throws Exception { .when() .pathParam("groupId", GROUP) .pathParam("artifactId", "testDeleteArtifact/EmptyAPI") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -857,7 +838,7 @@ public void testDeleteArtifactVersion() throws Exception { .when() .pathParam("groupId", GROUP) .pathParam("artifactId", "testDeleteArtifactVersion/EmptyAPI") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -883,7 +864,7 @@ public void testDeleteArtifactVersion() throws Exception { .pathParam("groupId", GROUP) .pathParam("artifactId", "testDeleteArtifactVersion/EmptyAPI") .pathParam("version", "1") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -919,7 +900,7 @@ public void testDeleteArtifactVersion() throws Exception { .pathParam("groupId", GROUP) .pathParam("artifactId", "testDeleteArtifactVersion/EmptyAPI") .pathParam("version", "2") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -1153,7 +1134,7 @@ public void testCreateArtifactVersion() throws Exception { .when() .pathParam("groupId", GROUP) .pathParam("artifactId", "testCreateArtifactVersion/EmptyAPI") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -1263,7 +1244,7 @@ public void testCreateArtifactVersionNoAscii() throws Exception { .contentType(CT_JSON) .pathParam("groupId", GROUP) .pathParam("artifactId", "testCreateArtifactVersionNoAscii/EmptyAPI") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/meta") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") .then() .statusCode(200) .body("name", equalTo(customNameNoASCII)) @@ -1425,7 +1406,7 @@ public void testGetArtifactVersion() throws Exception { .pathParam("groupId", GROUP) .pathParam("artifactId", "testGetArtifactVersion/EmptyAPI") .pathParam("version", version) - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/content") .then() .statusCode(200) .body("info.title", equalTo(expected)); @@ -2023,7 +2004,7 @@ public void testArtifactVersionMetaData() throws Exception { .pathParam("groupId", GROUP) .pathParam("artifactId", "testArtifactVersionMetaData/EmptyAPI") .pathParam("version", version2) - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/meta") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") .then() .statusCode(200) .body("version", equalTo(version2)) @@ -2043,7 +2024,7 @@ public void testArtifactVersionMetaData() throws Exception { .pathParam("artifactId", "testArtifactVersionMetaData/EmptyAPI") .pathParam("version", version2) .body(metaData) - .put("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/meta") + .put("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") .then() .statusCode(204); @@ -2054,7 +2035,7 @@ public void testArtifactVersionMetaData() throws Exception { .pathParam("groupId", GROUP) .pathParam("artifactId", "testArtifactVersionMetaData/EmptyAPI") .pathParam("version", version2) - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/meta") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") .then() .statusCode(200) .body("version", equalTo(version2)) @@ -2070,7 +2051,7 @@ public void testArtifactVersionMetaData() throws Exception { .pathParam("groupId", GROUP) .pathParam("artifactId", "testArtifactVersionMetaData/EmptyAPI") .pathParam("version", version3) - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/meta") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") .then() .statusCode(200) .body("version", equalTo(version3)) @@ -2085,7 +2066,7 @@ public void testArtifactVersionMetaData() throws Exception { .pathParam("groupId", GROUP) .pathParam("artifactId", "testArtifactVersionMetaData/EmptyAPI") .pathParam("version", 12345) - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/meta") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") .then() .statusCode(404); @@ -2119,7 +2100,7 @@ public void testYamlContentType() throws Exception { .when() .pathParam("groupId", GROUP) .pathParam("artifactId", "testYamlContentType") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .header("Content-Type", Matchers.containsString(CT_JSON)) @@ -2154,7 +2135,7 @@ public void testWsdlArtifact() throws Exception { .when() .pathParam("groupId", GROUP) .pathParam("artifactId", "testWsdlArtifact") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .header("Content-Type", Matchers.containsString(CT_XML)); @@ -2385,7 +2366,7 @@ public void testCorrectGroup() throws Exception { .when() .pathParam("groupId", groupId) .pathParam("artifactId", artifactId) - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -2396,7 +2377,7 @@ public void testCorrectGroup() throws Exception { .when() .pathParam("groupId", groupId) .pathParam("artifactId", artifactId) - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/meta") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") .then() .statusCode(200) .body("groupId", equalTo(groupId)) @@ -2437,7 +2418,7 @@ public void testCustomArtifactVersion() throws Exception { .pathParam("groupId", groupId) .pathParam("artifactId", artifactId) .pathParam("version", "1.0.0") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -2449,7 +2430,7 @@ public void testCustomArtifactVersion() throws Exception { .pathParam("groupId", groupId) .pathParam("artifactId", artifactId) .pathParam("version", "1.0.0") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/meta") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") .then() .statusCode(200) .body("artifactId", equalTo(artifactId)) @@ -3032,7 +3013,7 @@ public void testGetArtifactVersionWithReferences() throws Exception { .when() .pathParam("groupId", GROUP) .pathParam("artifactId", "testGetArtifactVersionWithReferences/WithExternalRef") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -3044,7 +3025,7 @@ public void testGetArtifactVersionWithReferences() throws Exception { .pathParam("groupId", GROUP) .pathParam("artifactId", "testGetArtifactVersionWithReferences/WithExternalRef") .queryParam("references", "REWRITE") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -3056,7 +3037,7 @@ public void testGetArtifactVersionWithReferences() throws Exception { .pathParam("groupId", GROUP) .pathParam("artifactId", "testGetArtifactVersionWithReferences/WithExternalRef") .queryParam("references", "DEREFERENCE") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -3364,7 +3345,6 @@ public void testBranches() throws Exception { .byArtifactId(artifactId) .versions() .byVersionExpression("branch=latest") - .meta() .get(); assertNotNull(version); @@ -3377,7 +3357,6 @@ public void testBranches() throws Exception { .byArtifactId(artifactId) .versions() .byVersionExpression("branch=branch2") - .meta() .get(); assertNotNull(version); @@ -3391,7 +3370,6 @@ public void testBranches() throws Exception { .byArtifactId(artifactId) .versions() .byVersionExpression("branch=") - .meta() .get(); }); @@ -3435,7 +3413,6 @@ public void testBranches() throws Exception { .byArtifactId(artifactId) .versions() .byVersionExpression("branch=branch2") - .meta() .get(); }); @@ -3495,7 +3472,6 @@ public void testBranches() throws Exception { .byArtifactId(artifactId) .versions() .byVersionExpression("2") - .meta() .get(); return false; } catch (Exception ignored) { @@ -3536,7 +3512,6 @@ public void testBranches() throws Exception { .byArtifactId(artifactId) .versions() .byVersionExpression("branch=latest") - .meta() .get(); return false; } catch (Exception ignored) { diff --git a/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/IdsResourceTest.java b/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/IdsResourceTest.java index 85996b993f..508aa2cc28 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/IdsResourceTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/IdsResourceTest.java @@ -71,7 +71,7 @@ public void testIdsAfterCreate() throws Exception { .contentType(CT_JSON) .pathParam("groupId", GROUP) .pathParam("artifactId", artifactId1) - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/meta") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") .then() .statusCode(200) .body("type", equalTo(ArtifactType.OPENAPI)) @@ -85,7 +85,7 @@ public void testIdsAfterCreate() throws Exception { .contentType(CT_JSON) .pathParam("groupId", GROUP) .pathParam("artifactId", artifactId2) - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/meta") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") .then() .statusCode(200) .body("type", equalTo(ArtifactType.OPENAPI)) @@ -113,7 +113,7 @@ public void testIdsAfterCreate() throws Exception { .pathParam("groupId", GROUP) .pathParam("artifactId", amd1.getArtifactId()) .pathParam("version", amd1.getVersion()) - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/meta") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") .then() .statusCode(200) .body("globalId", equalTo(amd1.getGlobalId().intValue())) diff --git a/app/src/test/java/io/apicurio/registry/noprofile/serde/AvroSerdeTest.java b/app/src/test/java/io/apicurio/registry/noprofile/serde/AvroSerdeTest.java index 86d7db9de1..f046a88c9c 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/serde/AvroSerdeTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/serde/AvroSerdeTest.java @@ -135,14 +135,14 @@ record = deserializer.deserialize(topic, bytes); @Test public void testAvro() throws Exception { testAvroAutoRegisterIdInBody(RecordIdStrategy.class, () -> { - return restClient.groups().byGroupId("test-group-avro").artifacts().byArtifactId("myrecord3").versions().byVersionExpression("branch=latest").meta().get(); + return restClient.groups().byGroupId("test-group-avro").artifacts().byArtifactId("myrecord3").versions().byVersionExpression("branch=latest").get(); }); } @Test public void testAvroQualifiedRecordIdStrategy() throws Exception { testAvroAutoRegisterIdInBody(QualifiedRecordIdStrategy.class, () -> { - return restClient.groups().byGroupId(GroupId.DEFAULT.getRawGroupIdWithDefaultString()).artifacts().byArtifactId("test-group-avro.myrecord3").versions().byVersionExpression("branch=latest").meta().get(); + return restClient.groups().byGroupId(GroupId.DEFAULT.getRawGroupIdWithDefaultString()).artifacts().byArtifactId("test-group-avro.myrecord3").versions().byVersionExpression("branch=latest").get(); }); } diff --git a/app/src/test/java/io/apicurio/registry/noprofile/serde/JsonSchemaSerdeTest.java b/app/src/test/java/io/apicurio/registry/noprofile/serde/JsonSchemaSerdeTest.java index 6af42d257d..c16827a130 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/serde/JsonSchemaSerdeTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/serde/JsonSchemaSerdeTest.java @@ -496,7 +496,7 @@ public void complexObjectValidation() throws Exception { JsonNode validationFor = objectMapper.readTree(data); VersionMetaData global = - client.groups().byGroupId("GLOBAL").artifacts().byArtifactId("sample.account.json").versions().byVersionExpression("branch=latest").meta().get(); + client.groups().byGroupId("GLOBAL").artifacts().byArtifactId("sample.account.json").versions().byVersionExpression("branch=latest").get(); // client.getArtifactMetaData("GLOBAL", "sample.account.json"); io.apicurio.registry.resolver.strategy.ArtifactReference artifactReference = io.apicurio.registry.resolver.strategy.ArtifactReference.builder().globalId(global.getGlobalId()) .groupId("GLOBAL")//.version("4") diff --git a/app/src/test/java/io/apicurio/registry/noprofile/serde/ProtobufSerdeTest.java b/app/src/test/java/io/apicurio/registry/noprofile/serde/ProtobufSerdeTest.java index b241657b5d..7319e48c59 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/serde/ProtobufSerdeTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/serde/ProtobufSerdeTest.java @@ -129,7 +129,7 @@ public void testProto() throws Exception { waitForSchema(globalId -> { try { if (restClient.ids().globalIds().byGlobalId(globalId).get().readAllBytes().length > 0) { - VersionMetaData artifactMetadata = restClient.groups().byGroupId(groupId).artifacts().byArtifactId(topic).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData artifactMetadata = restClient.groups().byGroupId(groupId).artifacts().byArtifactId(topic).versions().byVersionExpression("branch=latest").get(); assertEquals(globalId, artifactMetadata.getGlobalId()); return true; } diff --git a/app/src/test/java/io/apicurio/registry/rbac/AdminResourceTest.java b/app/src/test/java/io/apicurio/registry/rbac/AdminResourceTest.java index 718e743b70..3caf3c68a8 100644 --- a/app/src/test/java/io/apicurio/registry/rbac/AdminResourceTest.java +++ b/app/src/test/java/io/apicurio/registry/rbac/AdminResourceTest.java @@ -568,7 +568,7 @@ void testImport() throws Exception { assertNotNull(clientV3.ids().globalIds().byGlobalId(1005L).get()); //this is the artifactId for the artifact with globalId 1005 - var lastArtifactMeta = clientV3.groups().byGroupId("ImportTest").artifacts().byArtifactId("Artifact-3").versions().byVersionExpression("branch=latest").meta().get(); + var lastArtifactMeta = clientV3.groups().byGroupId("ImportTest").artifacts().byArtifactId("Artifact-3").versions().byVersionExpression("branch=latest").get(); assertEquals("1.0.2", lastArtifactMeta.getVersion()); assertEquals(1005L, lastArtifactMeta.getGlobalId()); diff --git a/app/src/test/java/io/apicurio/registry/rbac/RegistryClientTest.java b/app/src/test/java/io/apicurio/registry/rbac/RegistryClientTest.java index 0ccd1ca4ba..41d0373c75 100644 --- a/app/src/test/java/io/apicurio/registry/rbac/RegistryClientTest.java +++ b/app/src/test/java/io/apicurio/registry/rbac/RegistryClientTest.java @@ -154,7 +154,7 @@ public void testCreateArtifact() throws Exception { assertEquals(version, created.getVersion()); assertEquals(name, created.getName()); assertEquals(description, created.getDescription()); - assertEquals(ARTIFACT_CONTENT, new String(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get().readAllBytes(), StandardCharsets.UTF_8)); + assertEquals(ARTIFACT_CONTENT, new String(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get().readAllBytes(), StandardCharsets.UTF_8)); } @Test @@ -238,7 +238,7 @@ public void testCreateYamlArtifact() throws Exception { assertEquals(version, created.getVersion()); assertEquals(name, created.getName()); assertEquals(description, created.getDescription()); - assertMultilineTextEquals(ARTIFACT_OPENAPI_JSON_CONTENT, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get())); + assertMultilineTextEquals(ARTIFACT_OPENAPI_JSON_CONTENT, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get())); } @Test @@ -276,7 +276,7 @@ public void testCreateArtifactVersion() throws Exception { assertEquals(artifactId, amd.getName()); assertNull(amd.getDescription()); - assertEquals(UPDATED_CONTENT, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get())); + assertEquals(UPDATED_CONTENT, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get())); } @Test @@ -306,7 +306,7 @@ public void testCreateYamlArtifactVersion() throws Exception { postReq.headers.replace("Content-Type", Set.of(ContentTypes.APPLICATION_YAML)); VersionMetaData versionMetaData = anonymousAdapter.send(postReq, new HashMap<>(), VersionMetaData::createFromDiscriminatorValue); - VersionMetaData amd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData amd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); //Assertions assertNotNull(versionMetaData); @@ -319,7 +319,7 @@ public void testCreateYamlArtifactVersion() throws Exception { assertEquals(name, amd.getName()); assertEquals(description, amd.getDescription()); - assertMultilineTextEquals(UPDATED_OPENAPI_JSON_CONTENT, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get())); + assertMultilineTextEquals(UPDATED_OPENAPI_JSON_CONTENT, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get())); } @Test @@ -360,7 +360,7 @@ public void testAsyncCRUD() throws Exception { clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().post(content); //Assertions - assertEquals(UPDATED_CONTENT, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get())); + assertEquals(UPDATED_CONTENT, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get())); List> auditLogs = auditLogService.getAuditLogs(); assertFalse(auditLogs.isEmpty()); @@ -654,8 +654,8 @@ void testSearchDisabledArtifacts() throws Exception { // Put 2 of the 5 artifacts in DISABLED state EditableVersionMetaData eamd = new EditableVersionMetaData(); eamd.setState(VersionState.DISABLED); - clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactIds.get(0)).versions().byVersionExpression("1").meta().put(eamd); - clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactIds.get(3)).versions().byVersionExpression("1").meta().put(eamd); + clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactIds.get(0)).versions().byVersionExpression("1").put(eamd); + clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactIds.get(3)).versions().byVersionExpression("1").put(eamd); //Execution // Check the search results still include the DISABLED artifacts @@ -719,8 +719,8 @@ void testSearchDisabledVersions() throws Exception { // Put 2 of the 3 versions in DISABLED state EditableVersionMetaData evmd = new EditableVersionMetaData(); evmd.setState(VersionState.DISABLED); - clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").meta().put(evmd); - clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").meta().put(evmd); + clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").put(evmd); + clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("3").put(evmd); //Execution // Check that the search results still include the DISABLED versions @@ -888,7 +888,7 @@ public void getLatestArtifact() throws Exception { createArtifact(groupId, artifactId); //Execution - InputStream amd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); + InputStream amd = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get(); //Assertions assertNotNull(amd); @@ -1188,9 +1188,9 @@ public void testUpdateArtifact() throws Exception { }); //Assertions - assertEquals(updatedContent, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get())); + assertEquals(updatedContent, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get())); - VersionMetaData artifactMetaData = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData artifactMetaData = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); assertNotNull(artifactMetaData); assertEquals(version, artifactMetaData.getVersion()); assertEquals(name, artifactMetaData.getName()); @@ -1226,9 +1226,9 @@ public void testUpdateYamlArtifact() throws Exception { anonymousAdapter.send(request, new HashMap<>(), VersionMetaData::createFromDiscriminatorValue); //Assertions - assertMultilineTextEquals(UPDATED_OPENAPI_JSON_CONTENT, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get())); + assertMultilineTextEquals(UPDATED_OPENAPI_JSON_CONTENT, IoUtil.toString(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get())); - VersionMetaData artifactMetaData = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData artifactMetaData = clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); assertNotNull(artifactMetaData); assertEquals(version, artifactMetaData.getVersion()); assertEquals(name, artifactMetaData.getName()); @@ -1397,10 +1397,10 @@ private void verifyGroupNullInMetadata(String artifactId, String content) throws ArtifactMetaData meta = clientV3.groups().byGroupId(GroupId.DEFAULT.getRawGroupIdWithDefaultString()).artifacts().byArtifactId(artifactId).get(); assertTrue(new GroupId(meta.getGroupId()).isDefaultGroup()); - VersionMetaData vmeta = clientV3.groups().byGroupId(GroupId.DEFAULT.getRawGroupIdWithDefaultString()).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData vmeta = clientV3.groups().byGroupId(GroupId.DEFAULT.getRawGroupIdWithDefaultString()).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); assertTrue(new GroupId(vmeta.getGroupId()).isDefaultGroup()); - vmeta = clientV3.groups().byGroupId(GroupId.DEFAULT.getRawGroupIdWithDefaultString()).artifacts().byArtifactId(artifactId).versions().byVersionExpression(vmeta.getVersion()).meta().get(); + vmeta = clientV3.groups().byGroupId(GroupId.DEFAULT.getRawGroupIdWithDefaultString()).artifacts().byArtifactId(artifactId).versions().byVersionExpression(vmeta.getVersion()).get(); assertTrue(new GroupId(vmeta.getGroupId()).isDefaultGroup()); ArtifactContent artifactContent = new ArtifactContent(); @@ -1660,7 +1660,7 @@ public void testForceArtifactType() throws Exception { assertEquals(ArtifactType.AVRO, meta.getType()); - assertTrue(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get().readAllBytes().length > 0); + assertTrue(clientV3.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get().readAllBytes().length > 0); } @Test diff --git a/app/src/test/java/io/apicurio/registry/rest/DisableApisFlagsTest.java b/app/src/test/java/io/apicurio/registry/rest/DisableApisFlagsTest.java index d70676013d..7726890e4b 100644 --- a/app/src/test/java/io/apicurio/registry/rest/DisableApisFlagsTest.java +++ b/app/src/test/java/io/apicurio/registry/rest/DisableApisFlagsTest.java @@ -66,7 +66,7 @@ private void doTestArtifactVersionDeletionDisabled() throws Exception { .when() .pathParam("groupId", GROUP) .pathParam("artifactId", "testDeleteArtifactVersion/EmptyAPI") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/branch=latest/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) @@ -78,7 +78,7 @@ private void doTestArtifactVersionDeletionDisabled() throws Exception { .pathParam("groupId", GROUP) .pathParam("artifactId", "testDeleteArtifactVersion/EmptyAPI") .pathParam("version", "1") - .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}") + .get("/registry/v3/groups/{groupId}/artifacts/{artifactId}/versions/{version}/content") .then() .statusCode(200) .body("openapi", equalTo("3.0.2")) diff --git a/common/src/main/resources/META-INF/openapi.json b/common/src/main/resources/META-INF/openapi.json index a86916e8d6..83f1157858 100644 --- a/common/src/main/resources/META-INF/openapi.json +++ b/common/src/main/resources/META-INF/openapi.json @@ -569,8 +569,8 @@ "description": "Imports registry data that was previously exported using the `/admin/export` operation." } }, - "/groups/{groupId}/artifacts/{artifactId}/versions/{versionExpression}/meta": { - "summary": "Manage the metadata for a single version of an artifact in the registry.", + "/groups/{groupId}/artifacts/{artifactId}/versions/{versionExpression}": { + "summary": "Manage a single version of a single artifact in the registry.", "get": { "tags": [ "Metadata" @@ -632,70 +632,6 @@ "summary": "Update artifact version metadata", "description": "Updates the user-editable portion of the artifact version's metadata. Only some of \nthe metadata fields are editable by the user. For example, `description` is editable, \nbut `createdOn` is not.\n\nThis operation can fail for the following reasons:\n\n* No artifact with this `artifactId` exists (HTTP error `404`)\n* No version with this `version` exists (HTTP error `404`)\n* A server error occurred (HTTP error `500`)\n" }, - "parameters": [ - { - "name": "groupId", - "description": "The artifact group ID. Must be a string provided by the client, representing the name of the grouping of artifacts. Must follow the \".{1,512}\" pattern.", - "schema": { - "$ref": "#/components/schemas/GroupId" - }, - "in": "path", - "required": true - }, - { - "name": "artifactId", - "description": "The artifact ID. Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier. Must follow the \".{1,512}\" pattern.", - "schema": { - "$ref": "#/components/schemas/ArtifactId" - }, - "in": "path", - "required": true - }, - { - "name": "versionExpression", - "description": "An expression resolvable to a specific version ID within the given group and artifact. The following rules apply:\n\n - If the expression is in the form \"branch={branchId}\", and artifact branch {branchId} exists: The expression is resolved to a version that the branch points to.\n - Otherwise: The expression is resolved to a version with the same ID, which must follow the \"[a-zA-Z0-9._\\\\-+]{1,256}\" pattern.", - "schema": { - "type": "string" - }, - "in": "path", - "required": true - } - ] - }, - "/groups/{groupId}/artifacts/{artifactId}/versions/{versionExpression}": { - "summary": "Manage a single version of a single artifact in the registry.", - "get": { - "tags": [ - "Versions" - ], - "parameters": [ - { - "name": "references", - "description": "Allows the user to specify how references in the content should be treated.", - "schema": { - "$ref": "#/components/schemas/HandleReferencesType" - }, - "in": "query" - } - ], - "responses": { - "200": { - "$ref": "#/components/responses/ArtifactContent" - }, - "400": { - "$ref": "#/components/responses/BadRequest" - }, - "404": { - "$ref": "#/components/responses/NotFound" - }, - "500": { - "$ref": "#/components/responses/ServerError" - } - }, - "operationId": "getArtifactVersion", - "summary": "Get artifact version", - "description": "Retrieves a single version of the artifact content. Both the `artifactId` and the\nunique `version` number must be provided. The `Content-Type` of the response depends \non the artifact type. In most cases, this is `application/json`, but for some types \nit may be different (for example, `PROTOBUF`).\n\nThis operation can fail for the following reasons:\n\n* No artifact with this `artifactId` exists (HTTP error `404`)\n* No version with this `version` exists (HTTP error `404`)\n* A server error occurred (HTTP error `500`)\n" - }, "delete": { "tags": [ "Versions" @@ -3011,6 +2947,70 @@ } ] }, + "/groups/{groupId}/artifacts/{artifactId}/versions/{versionExpression}/content": { + "summary": "Manage a single version of a single artifact in the registry.", + "get": { + "tags": [ + "Versions" + ], + "parameters": [ + { + "name": "references", + "description": "Allows the user to specify how references in the content should be treated.", + "schema": { + "$ref": "#/components/schemas/HandleReferencesType" + }, + "in": "query" + } + ], + "responses": { + "200": { + "$ref": "#/components/responses/ArtifactContent" + }, + "400": { + "$ref": "#/components/responses/BadRequest" + }, + "404": { + "$ref": "#/components/responses/NotFound" + }, + "500": { + "$ref": "#/components/responses/ServerError" + } + }, + "operationId": "getArtifactVersionContent", + "summary": "Get artifact version", + "description": "Retrieves a single version of the artifact content. Both the `artifactId` and the\nunique `version` number must be provided. The `Content-Type` of the response depends \non the artifact type. In most cases, this is `application/json`, but for some types \nit may be different (for example, `PROTOBUF`).\n\nThis operation can fail for the following reasons:\n\n* No artifact with this `artifactId` exists (HTTP error `404`)\n* No version with this `version` exists (HTTP error `404`)\n* A server error occurred (HTTP error `500`)\n" + }, + "parameters": [ + { + "name": "groupId", + "description": "The artifact group ID. Must be a string provided by the client, representing the name of the grouping of artifacts. Must follow the \".{1,512}\" pattern.", + "schema": { + "$ref": "#/components/schemas/GroupId" + }, + "in": "path", + "required": true + }, + { + "name": "artifactId", + "description": "The artifact ID. Can be a string (client-provided) or UUID (server-generated), representing the unique artifact identifier. Must follow the \".{1,512}\" pattern.", + "schema": { + "$ref": "#/components/schemas/ArtifactId" + }, + "in": "path", + "required": true + }, + { + "name": "versionExpression", + "description": "An expression resolvable to a specific version ID within the given group and artifact. The following rules apply:\n\n - If the expression is in the form \"branch={branchId}\", and artifact branch {branchId} exists: The expression is resolved to a version that the branch points to.\n - Otherwise: The expression is resolved to a version with the same ID, which must follow the \"[a-zA-Z0-9._\\\\-+]{1,256}\" pattern.", + "schema": { + "type": "string" + }, + "in": "path", + "required": true + } + ] + }, "x-codegen-contextRoot": "/apis/registry/v3" }, "components": { diff --git a/go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_item_content_request_builder.go b/go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_item_content_request_builder.go new file mode 100644 index 0000000000..1b8b4f8548 --- /dev/null +++ b/go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_item_content_request_builder.go @@ -0,0 +1,86 @@ +package groups + +import ( + "context" + i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71 "github.com/apicurio/apicurio-registry/go-sdk/pkg/registryclient-v3/models" + i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" +) + +// ItemArtifactsItemVersionsItemContentRequestBuilder manage a single version of a single artifact in the registry. +type ItemArtifactsItemVersionsItemContentRequestBuilder struct { + i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.BaseRequestBuilder +} + +// ItemArtifactsItemVersionsItemContentRequestBuilderGetQueryParameters retrieves a single version of the artifact content. Both the `artifactId` and theunique `version` number must be provided. The `Content-Type` of the response depends on the artifact type. In most cases, this is `application/json`, but for some types it may be different (for example, `PROTOBUF`).This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) +type ItemArtifactsItemVersionsItemContentRequestBuilderGetQueryParameters struct { + // Allows the user to specify how references in the content should be treated. + // Deprecated: This property is deprecated, use referencesAsHandleReferencesType instead + References *string `uriparametername:"references"` + // Allows the user to specify how references in the content should be treated. + ReferencesAsHandleReferencesType *i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.HandleReferencesType `uriparametername:"references"` +} + +// ItemArtifactsItemVersionsItemContentRequestBuilderGetRequestConfiguration configuration for the request such as headers, query parameters, and middleware options. +type ItemArtifactsItemVersionsItemContentRequestBuilderGetRequestConfiguration struct { + // Request headers + Headers *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestHeaders + // Request options + Options []i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestOption + // Request query parameters + QueryParameters *ItemArtifactsItemVersionsItemContentRequestBuilderGetQueryParameters +} + +// NewItemArtifactsItemVersionsItemContentRequestBuilderInternal instantiates a new ContentRequestBuilder and sets the default values. +func NewItemArtifactsItemVersionsItemContentRequestBuilderInternal(pathParameters map[string]string, requestAdapter i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestAdapter) *ItemArtifactsItemVersionsItemContentRequestBuilder { + m := &ItemArtifactsItemVersionsItemContentRequestBuilder{ + BaseRequestBuilder: *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewBaseRequestBuilder(requestAdapter, "{+baseurl}/groups/{groupId}/artifacts/{artifactId}/versions/{versionExpression}/content{?references*}", pathParameters), + } + return m +} + +// NewItemArtifactsItemVersionsItemContentRequestBuilder instantiates a new ContentRequestBuilder and sets the default values. +func NewItemArtifactsItemVersionsItemContentRequestBuilder(rawUrl string, requestAdapter i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestAdapter) *ItemArtifactsItemVersionsItemContentRequestBuilder { + urlParams := make(map[string]string) + urlParams["request-raw-url"] = rawUrl + return NewItemArtifactsItemVersionsItemContentRequestBuilderInternal(urlParams, requestAdapter) +} + +// Get retrieves a single version of the artifact content. Both the `artifactId` and theunique `version` number must be provided. The `Content-Type` of the response depends on the artifact type. In most cases, this is `application/json`, but for some types it may be different (for example, `PROTOBUF`).This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) +func (m *ItemArtifactsItemVersionsItemContentRequestBuilder) Get(ctx context.Context, requestConfiguration *ItemArtifactsItemVersionsItemContentRequestBuilderGetRequestConfiguration) ([]byte, error) { + requestInfo, err := m.ToGetRequestInformation(ctx, requestConfiguration) + if err != nil { + return nil, err + } + errorMapping := i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.ErrorMappings{ + "400": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, + "404": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, + "500": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, + } + res, err := m.BaseRequestBuilder.RequestAdapter.SendPrimitive(ctx, requestInfo, "[]byte", errorMapping) + if err != nil { + return nil, err + } + if res == nil { + return nil, nil + } + return res.([]byte), nil +} + +// ToGetRequestInformation retrieves a single version of the artifact content. Both the `artifactId` and theunique `version` number must be provided. The `Content-Type` of the response depends on the artifact type. In most cases, this is `application/json`, but for some types it may be different (for example, `PROTOBUF`).This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) +func (m *ItemArtifactsItemVersionsItemContentRequestBuilder) ToGetRequestInformation(ctx context.Context, requestConfiguration *ItemArtifactsItemVersionsItemContentRequestBuilderGetRequestConfiguration) (*i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestInformation, error) { + requestInfo := i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewRequestInformationWithMethodAndUrlTemplateAndPathParameters(i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.GET, m.BaseRequestBuilder.UrlTemplate, m.BaseRequestBuilder.PathParameters) + if requestConfiguration != nil { + if requestConfiguration.QueryParameters != nil { + requestInfo.AddQueryParameters(*(requestConfiguration.QueryParameters)) + } + requestInfo.Headers.AddAll(requestConfiguration.Headers) + requestInfo.AddRequestOptions(requestConfiguration.Options) + } + requestInfo.Headers.TryAdd("Accept", "*/*, application/json") + return requestInfo, nil +} + +// WithUrl returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored. +func (m *ItemArtifactsItemVersionsItemContentRequestBuilder) WithUrl(rawUrl string) *ItemArtifactsItemVersionsItemContentRequestBuilder { + return NewItemArtifactsItemVersionsItemContentRequestBuilder(rawUrl, m.BaseRequestBuilder.RequestAdapter) +} diff --git a/go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_item_meta_request_builder.go b/go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_item_meta_request_builder.go deleted file mode 100644 index 8c2ffe3df1..0000000000 --- a/go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_item_meta_request_builder.go +++ /dev/null @@ -1,113 +0,0 @@ -package groups - -import ( - "context" - i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71 "github.com/apicurio/apicurio-registry/go-sdk/pkg/registryclient-v3/models" - i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" -) - -// ItemArtifactsItemVersionsItemMetaRequestBuilder manage the metadata for a single version of an artifact in the registry. -type ItemArtifactsItemVersionsItemMetaRequestBuilder struct { - i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.BaseRequestBuilder -} - -// ItemArtifactsItemVersionsItemMetaRequestBuilderGetRequestConfiguration configuration for the request such as headers, query parameters, and middleware options. -type ItemArtifactsItemVersionsItemMetaRequestBuilderGetRequestConfiguration struct { - // Request headers - Headers *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestHeaders - // Request options - Options []i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestOption -} - -// ItemArtifactsItemVersionsItemMetaRequestBuilderPutRequestConfiguration configuration for the request such as headers, query parameters, and middleware options. -type ItemArtifactsItemVersionsItemMetaRequestBuilderPutRequestConfiguration struct { - // Request headers - Headers *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestHeaders - // Request options - Options []i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestOption -} - -// NewItemArtifactsItemVersionsItemMetaRequestBuilderInternal instantiates a new MetaRequestBuilder and sets the default values. -func NewItemArtifactsItemVersionsItemMetaRequestBuilderInternal(pathParameters map[string]string, requestAdapter i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestAdapter) *ItemArtifactsItemVersionsItemMetaRequestBuilder { - m := &ItemArtifactsItemVersionsItemMetaRequestBuilder{ - BaseRequestBuilder: *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewBaseRequestBuilder(requestAdapter, "{+baseurl}/groups/{groupId}/artifacts/{artifactId}/versions/{versionExpression}/meta", pathParameters), - } - return m -} - -// NewItemArtifactsItemVersionsItemMetaRequestBuilder instantiates a new MetaRequestBuilder and sets the default values. -func NewItemArtifactsItemVersionsItemMetaRequestBuilder(rawUrl string, requestAdapter i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestAdapter) *ItemArtifactsItemVersionsItemMetaRequestBuilder { - urlParams := make(map[string]string) - urlParams["request-raw-url"] = rawUrl - return NewItemArtifactsItemVersionsItemMetaRequestBuilderInternal(urlParams, requestAdapter) -} - -// Get retrieves the metadata for a single version of the artifact. The version metadata is a subset of the artifact metadata and only includes the metadata that is specific tothe version (for example, this doesn't include `modifiedOn`).This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) -func (m *ItemArtifactsItemVersionsItemMetaRequestBuilder) Get(ctx context.Context, requestConfiguration *ItemArtifactsItemVersionsItemMetaRequestBuilderGetRequestConfiguration) (i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.VersionMetaDataable, error) { - requestInfo, err := m.ToGetRequestInformation(ctx, requestConfiguration) - if err != nil { - return nil, err - } - errorMapping := i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.ErrorMappings{ - "400": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, - "404": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, - "500": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, - } - res, err := m.BaseRequestBuilder.RequestAdapter.Send(ctx, requestInfo, i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateVersionMetaDataFromDiscriminatorValue, errorMapping) - if err != nil { - return nil, err - } - if res == nil { - return nil, nil - } - return res.(i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.VersionMetaDataable), nil -} - -// Put updates the user-editable portion of the artifact version's metadata. Only some of the metadata fields are editable by the user. For example, `description` is editable, but `createdOn` is not.This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) -func (m *ItemArtifactsItemVersionsItemMetaRequestBuilder) Put(ctx context.Context, body i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.EditableVersionMetaDataable, requestConfiguration *ItemArtifactsItemVersionsItemMetaRequestBuilderPutRequestConfiguration) error { - requestInfo, err := m.ToPutRequestInformation(ctx, body, requestConfiguration) - if err != nil { - return err - } - errorMapping := i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.ErrorMappings{ - "400": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, - "404": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, - "500": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, - } - err = m.BaseRequestBuilder.RequestAdapter.SendNoContent(ctx, requestInfo, errorMapping) - if err != nil { - return err - } - return nil -} - -// ToGetRequestInformation retrieves the metadata for a single version of the artifact. The version metadata is a subset of the artifact metadata and only includes the metadata that is specific tothe version (for example, this doesn't include `modifiedOn`).This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) -func (m *ItemArtifactsItemVersionsItemMetaRequestBuilder) ToGetRequestInformation(ctx context.Context, requestConfiguration *ItemArtifactsItemVersionsItemMetaRequestBuilderGetRequestConfiguration) (*i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestInformation, error) { - requestInfo := i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewRequestInformationWithMethodAndUrlTemplateAndPathParameters(i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.GET, m.BaseRequestBuilder.UrlTemplate, m.BaseRequestBuilder.PathParameters) - if requestConfiguration != nil { - requestInfo.Headers.AddAll(requestConfiguration.Headers) - requestInfo.AddRequestOptions(requestConfiguration.Options) - } - requestInfo.Headers.TryAdd("Accept", "application/json") - return requestInfo, nil -} - -// ToPutRequestInformation updates the user-editable portion of the artifact version's metadata. Only some of the metadata fields are editable by the user. For example, `description` is editable, but `createdOn` is not.This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) -func (m *ItemArtifactsItemVersionsItemMetaRequestBuilder) ToPutRequestInformation(ctx context.Context, body i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.EditableVersionMetaDataable, requestConfiguration *ItemArtifactsItemVersionsItemMetaRequestBuilderPutRequestConfiguration) (*i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestInformation, error) { - requestInfo := i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewRequestInformationWithMethodAndUrlTemplateAndPathParameters(i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.PUT, m.BaseRequestBuilder.UrlTemplate, m.BaseRequestBuilder.PathParameters) - if requestConfiguration != nil { - requestInfo.Headers.AddAll(requestConfiguration.Headers) - requestInfo.AddRequestOptions(requestConfiguration.Options) - } - requestInfo.Headers.TryAdd("Accept", "application/json") - err := requestInfo.SetContentFromParsable(ctx, m.BaseRequestBuilder.RequestAdapter, "application/json", body) - if err != nil { - return nil, err - } - return requestInfo, nil -} - -// WithUrl returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored. -func (m *ItemArtifactsItemVersionsItemMetaRequestBuilder) WithUrl(rawUrl string) *ItemArtifactsItemVersionsItemMetaRequestBuilder { - return NewItemArtifactsItemVersionsItemMetaRequestBuilder(rawUrl, m.BaseRequestBuilder.RequestAdapter) -} diff --git a/go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_with_version_expression_item_request_builder.go b/go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_with_version_expression_item_request_builder.go index aaba3bfa10..633dc6d53b 100644 --- a/go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_with_version_expression_item_request_builder.go +++ b/go-sdk/pkg/registryclient-v3/groups/item_artifacts_item_versions_with_version_expression_item_request_builder.go @@ -19,23 +19,20 @@ type ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderDeleteReque Options []i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestOption } -// ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderGetQueryParameters retrieves a single version of the artifact content. Both the `artifactId` and theunique `version` number must be provided. The `Content-Type` of the response depends on the artifact type. In most cases, this is `application/json`, but for some types it may be different (for example, `PROTOBUF`).This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) -type ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderGetQueryParameters struct { - // Allows the user to specify how references in the content should be treated. - // Deprecated: This property is deprecated, use referencesAsHandleReferencesType instead - References *string `uriparametername:"references"` - // Allows the user to specify how references in the content should be treated. - ReferencesAsHandleReferencesType *i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.HandleReferencesType `uriparametername:"references"` -} - // ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderGetRequestConfiguration configuration for the request such as headers, query parameters, and middleware options. type ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderGetRequestConfiguration struct { // Request headers Headers *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestHeaders // Request options Options []i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestOption - // Request query parameters - QueryParameters *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderGetQueryParameters +} + +// ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderPutRequestConfiguration configuration for the request such as headers, query parameters, and middleware options. +type ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderPutRequestConfiguration struct { + // Request headers + Headers *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestHeaders + // Request options + Options []i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestOption } // Comments manage a collection of comments for an artifact version @@ -46,7 +43,7 @@ func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) Comme // NewItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderInternal instantiates a new WithVersionExpressionItemRequestBuilder and sets the default values. func NewItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderInternal(pathParameters map[string]string, requestAdapter i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestAdapter) *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder { m := &ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder{ - BaseRequestBuilder: *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewBaseRequestBuilder(requestAdapter, "{+baseurl}/groups/{groupId}/artifacts/{artifactId}/versions/{versionExpression}{?references*}", pathParameters), + BaseRequestBuilder: *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewBaseRequestBuilder(requestAdapter, "{+baseurl}/groups/{groupId}/artifacts/{artifactId}/versions/{versionExpression}", pathParameters), } return m } @@ -58,6 +55,11 @@ func NewItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder(rawUrl return NewItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderInternal(urlParams, requestAdapter) } +// Content manage a single version of a single artifact in the registry. +func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) Content() *ItemArtifactsItemVersionsItemContentRequestBuilder { + return NewItemArtifactsItemVersionsItemContentRequestBuilderInternal(m.BaseRequestBuilder.PathParameters, m.BaseRequestBuilder.RequestAdapter) +} + // Delete deletes a single version of the artifact. Parameters `groupId`, `artifactId` and the unique `version`are needed. If this is the only version of the artifact, this operation is the same as deleting the entire artifact.This feature is disabled by default and it's discouraged for normal usage. To enable it, set the `registry.rest.artifact.deletion.enabled` property to true. This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`) * Feature is disabled (HTTP error `405`) * A server error occurred (HTTP error `500`) func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) Delete(ctx context.Context, requestConfiguration *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderDeleteRequestConfiguration) error { requestInfo, err := m.ToDeleteRequestInformation(ctx, requestConfiguration) @@ -77,8 +79,8 @@ func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) Delet return nil } -// Get retrieves a single version of the artifact content. Both the `artifactId` and theunique `version` number must be provided. The `Content-Type` of the response depends on the artifact type. In most cases, this is `application/json`, but for some types it may be different (for example, `PROTOBUF`).This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) -func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) Get(ctx context.Context, requestConfiguration *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderGetRequestConfiguration) ([]byte, error) { +// Get retrieves the metadata for a single version of the artifact. The version metadata is a subset of the artifact metadata and only includes the metadata that is specific tothe version (for example, this doesn't include `modifiedOn`).This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) +func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) Get(ctx context.Context, requestConfiguration *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderGetRequestConfiguration) (i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.VersionMetaDataable, error) { requestInfo, err := m.ToGetRequestInformation(ctx, requestConfiguration) if err != nil { return nil, err @@ -88,19 +90,32 @@ func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) Get(c "404": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, "500": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, } - res, err := m.BaseRequestBuilder.RequestAdapter.SendPrimitive(ctx, requestInfo, "[]byte", errorMapping) + res, err := m.BaseRequestBuilder.RequestAdapter.Send(ctx, requestInfo, i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateVersionMetaDataFromDiscriminatorValue, errorMapping) if err != nil { return nil, err } if res == nil { return nil, nil } - return res.([]byte), nil + return res.(i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.VersionMetaDataable), nil } -// Meta manage the metadata for a single version of an artifact in the registry. -func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) Meta() *ItemArtifactsItemVersionsItemMetaRequestBuilder { - return NewItemArtifactsItemVersionsItemMetaRequestBuilderInternal(m.BaseRequestBuilder.PathParameters, m.BaseRequestBuilder.RequestAdapter) +// Put updates the user-editable portion of the artifact version's metadata. Only some of the metadata fields are editable by the user. For example, `description` is editable, but `createdOn` is not.This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) +func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) Put(ctx context.Context, body i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.EditableVersionMetaDataable, requestConfiguration *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderPutRequestConfiguration) error { + requestInfo, err := m.ToPutRequestInformation(ctx, body, requestConfiguration) + if err != nil { + return err + } + errorMapping := i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.ErrorMappings{ + "400": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, + "404": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, + "500": i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.CreateErrorFromDiscriminatorValue, + } + err = m.BaseRequestBuilder.RequestAdapter.SendNoContent(ctx, requestInfo, errorMapping) + if err != nil { + return err + } + return nil } // References manage the references for a single version of an artifact in the registry. @@ -119,17 +134,29 @@ func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) ToDel return requestInfo, nil } -// ToGetRequestInformation retrieves a single version of the artifact content. Both the `artifactId` and theunique `version` number must be provided. The `Content-Type` of the response depends on the artifact type. In most cases, this is `application/json`, but for some types it may be different (for example, `PROTOBUF`).This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) +// ToGetRequestInformation retrieves the metadata for a single version of the artifact. The version metadata is a subset of the artifact metadata and only includes the metadata that is specific tothe version (for example, this doesn't include `modifiedOn`).This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) ToGetRequestInformation(ctx context.Context, requestConfiguration *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderGetRequestConfiguration) (*i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestInformation, error) { requestInfo := i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewRequestInformationWithMethodAndUrlTemplateAndPathParameters(i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.GET, m.BaseRequestBuilder.UrlTemplate, m.BaseRequestBuilder.PathParameters) if requestConfiguration != nil { - if requestConfiguration.QueryParameters != nil { - requestInfo.AddQueryParameters(*(requestConfiguration.QueryParameters)) - } requestInfo.Headers.AddAll(requestConfiguration.Headers) requestInfo.AddRequestOptions(requestConfiguration.Options) } - requestInfo.Headers.TryAdd("Accept", "*/*, application/json") + requestInfo.Headers.TryAdd("Accept", "application/json") + return requestInfo, nil +} + +// ToPutRequestInformation updates the user-editable portion of the artifact version's metadata. Only some of the metadata fields are editable by the user. For example, `description` is editable, but `createdOn` is not.This operation can fail for the following reasons:* No artifact with this `artifactId` exists (HTTP error `404`)* No version with this `version` exists (HTTP error `404`)* A server error occurred (HTTP error `500`) +func (m *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilder) ToPutRequestInformation(ctx context.Context, body i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.EditableVersionMetaDataable, requestConfiguration *ItemArtifactsItemVersionsWithVersionExpressionItemRequestBuilderPutRequestConfiguration) (*i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestInformation, error) { + requestInfo := i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewRequestInformationWithMethodAndUrlTemplateAndPathParameters(i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.PUT, m.BaseRequestBuilder.UrlTemplate, m.BaseRequestBuilder.PathParameters) + if requestConfiguration != nil { + requestInfo.Headers.AddAll(requestConfiguration.Headers) + requestInfo.AddRequestOptions(requestConfiguration.Options) + } + requestInfo.Headers.TryAdd("Accept", "application/json") + err := requestInfo.SetContentFromParsable(ctx, m.BaseRequestBuilder.RequestAdapter, "application/json", body) + if err != nil { + return nil, err + } return requestInfo, nil } diff --git a/go-sdk/pkg/registryclient-v3/kiota-lock.json b/go-sdk/pkg/registryclient-v3/kiota-lock.json index 51a9e32f6d..91d66b5a37 100644 --- a/go-sdk/pkg/registryclient-v3/kiota-lock.json +++ b/go-sdk/pkg/registryclient-v3/kiota-lock.json @@ -1,5 +1,5 @@ { - "descriptionHash": "F61430FC5C6371D04245E47C3FFEDFC0D9AFF6A907F00F5F4D91133F75DB075A87012D0BDFEC6C3712321D7515A4BF7CF0C32BBB4A06E383B6075F186D35594A", + "descriptionHash": "08E72D16D6B06384C173A2EC6C636BEF1B388AF1E8632780FCF1A9C0A1FA5F6FB947869ACDB700425DE34A3245F5802C60C1B164DEEC82CFE098287D61E804DD", "descriptionLocation": "../../v3.json", "lockFileVersion": "1.0.0", "kiotaVersion": "1.10.1", diff --git a/integration-tests/src/test/java/io/apicurio/tests/ApicurioRegistryBaseIT.java b/integration-tests/src/test/java/io/apicurio/tests/ApicurioRegistryBaseIT.java index 7840a57625..3a55682156 100644 --- a/integration-tests/src/test/java/io/apicurio/tests/ApicurioRegistryBaseIT.java +++ b/integration-tests/src/test/java/io/apicurio/tests/ApicurioRegistryBaseIT.java @@ -182,7 +182,7 @@ private void ensureClusterSync(Long globalId) throws Exception { } private void ensureClusterSync(String groupId, String artifactId, String version) throws Exception { - retry(() -> registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(version).meta().get()); + retry(() -> registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(version).get()); } private void ensureClusterSync(Consumer function) throws Exception { diff --git a/integration-tests/src/test/java/io/apicurio/tests/auth/SimpleAuthIT.java b/integration-tests/src/test/java/io/apicurio/tests/auth/SimpleAuthIT.java index ef645cebba..d4a7d4c189 100644 --- a/integration-tests/src/test/java/io/apicurio/tests/auth/SimpleAuthIT.java +++ b/integration-tests/src/test/java/io/apicurio/tests/auth/SimpleAuthIT.java @@ -124,7 +124,7 @@ public void testDevRole() throws Exception { }); TestUtils.retry(() -> client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).get()); - Assertions.assertTrue(client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get().readAllBytes().length > 0); + Assertions.assertTrue(client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get().readAllBytes().length > 0); Rule ruleConfig = new Rule(); ruleConfig.setType(RuleType.VALIDITY); @@ -162,7 +162,7 @@ public void testAdminRole() throws Exception { }); TestUtils.retry(() -> client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).get()); - Assertions.assertTrue(client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get().readAllBytes().length > 0); + Assertions.assertTrue(client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get().readAllBytes().length > 0); Rule ruleConfig = new Rule(); ruleConfig.setType(RuleType.VALIDITY); diff --git a/integration-tests/src/test/java/io/apicurio/tests/migration/DoNotPreserveIdsImportIT.java b/integration-tests/src/test/java/io/apicurio/tests/migration/DoNotPreserveIdsImportIT.java index fe20108c69..d7bc7971ad 100644 --- a/integration-tests/src/test/java/io/apicurio/tests/migration/DoNotPreserveIdsImportIT.java +++ b/integration-tests/src/test/java/io/apicurio/tests/migration/DoNotPreserveIdsImportIT.java @@ -97,7 +97,7 @@ public void testDoNotPreserveIdsImport() throws Exception { String groupId = entry.getKey().split(":")[0]; String artifactId = entry.getKey().split(":")[1]; String content = entry.getValue(); - var registryContent = dest.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); + var registryContent = dest.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get(); assertNotNull(registryContent); assertEquals(content, IoUtil.toString(registryContent)); } diff --git a/integration-tests/src/test/java/io/apicurio/tests/migration/GenerateCanonicalHashImportIT.java b/integration-tests/src/test/java/io/apicurio/tests/migration/GenerateCanonicalHashImportIT.java index 5d106f9aee..28b9b56863 100644 --- a/integration-tests/src/test/java/io/apicurio/tests/migration/GenerateCanonicalHashImportIT.java +++ b/integration-tests/src/test/java/io/apicurio/tests/migration/GenerateCanonicalHashImportIT.java @@ -67,7 +67,7 @@ public void testGeneratingCanonicalHashOnImport() throws Exception { The only way is to generate canonical hash and then search artifact by it. But that needs apicurio-registry-app module as dependency. */ - var registryContent = client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); + var registryContent = client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get(); assertNotNull(registryContent); assertEquals(content, IoUtil.toString(registryContent)); } diff --git a/integration-tests/src/test/java/io/apicurio/tests/serdes/apicurio/AvroSerdeIT.java b/integration-tests/src/test/java/io/apicurio/tests/serdes/apicurio/AvroSerdeIT.java index 8ab737a035..34d5e80abf 100644 --- a/integration-tests/src/test/java/io/apicurio/tests/serdes/apicurio/AvroSerdeIT.java +++ b/integration-tests/src/test/java/io/apicurio/tests/serdes/apicurio/AvroSerdeIT.java @@ -173,7 +173,7 @@ void testTopicIdStrategyAutoRegister() throws Exception { .withProducerProperty(SerdeConfig.AUTO_REGISTER_ARTIFACT, "true") .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); @@ -182,7 +182,7 @@ void testTopicIdStrategyAutoRegister() throws Exception { .test(); - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); byte[] rawSchema = IoUtil.toBytes(registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get()); assertEquals(new String(avroSchema.generateSchemaBytes()), new String(rawSchema)); @@ -459,7 +459,7 @@ public void testAvroJSON() throws Exception { .withConsumerProperty(AvroKafkaSerdeConfig.AVRO_ENCODING, AvroKafkaSerdeConfig.AVRO_ENCODING_JSON) .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); @@ -490,7 +490,7 @@ public void testReflectAutoRegister() throws Exception { .withConsumerProperty(AvroKafkaSerdeConfig.AVRO_DATUM_PROVIDER, ReflectAvroDatumProvider.class.getName()) .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); @@ -523,7 +523,7 @@ void testContentIdInHeaders() throws Exception { .withConsumerProperty(SerdeConfig.USE_ID, IdOption.contentId.name()) .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); @@ -556,7 +556,7 @@ void testContentIdInBody() throws Exception { .withConsumerProperty(SerdeConfig.USE_ID, IdOption.contentId.name()) .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); @@ -593,7 +593,7 @@ void testProducerUsesContentIdConsumerUsesDefault() throws Exception { .withProducerProperty(SerdeConfig.USE_ID, IdOption.contentId.name()) .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); @@ -630,7 +630,7 @@ void testProducerUsesDefaultConsumerUsesContentId() throws Exception { .withConsumerProperty(SerdeConfig.USE_ID, IdOption.contentId.name()) .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); @@ -683,7 +683,7 @@ void testFirstEmptyFieldConfusedAsMagicByte() throws Exception { .withProducerProperty(SerdeConfig.AUTO_REGISTER_ARTIFACT, "true") .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); diff --git a/integration-tests/src/test/java/io/apicurio/tests/serdes/apicurio/ProtobufSerdeIT.java b/integration-tests/src/test/java/io/apicurio/tests/serdes/apicurio/ProtobufSerdeIT.java index b91ec5e121..1935d01396 100644 --- a/integration-tests/src/test/java/io/apicurio/tests/serdes/apicurio/ProtobufSerdeIT.java +++ b/integration-tests/src/test/java/io/apicurio/tests/serdes/apicurio/ProtobufSerdeIT.java @@ -407,7 +407,7 @@ void testTopicIdStrategyAutoRegister() throws Exception { .withProducerProperty(SerdeConfig.AUTO_REGISTER_ARTIFACT, "true") .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); @@ -443,7 +443,7 @@ public void testAutoRegisterDynamicMessageProtobufType() throws Exception { .withConsumerProperty(SerdeConfig.DESERIALIZER_SPECIFIC_VALUE_RETURN_CLASS, DynamicMessage.class.getName()) .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); @@ -478,7 +478,7 @@ public void testAutoRegisterDeriveClassProtobufType() throws Exception { .withConsumerProperty(ProtobufKafkaDeserializerConfig.DERIVE_CLASS_FROM_SCHEMA, "true") .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); @@ -514,7 +514,7 @@ public void testAutoRegisterAndUseBody() throws Exception { .withConsumerProperty(ProtobufKafkaDeserializerConfig.DERIVE_CLASS_FROM_SCHEMA, "true") .withAfterProduceValidator(() -> { return TestUtils.retry(() -> { - VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData meta = registryClient.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); registryClient.ids().globalIds().byGlobalId(meta.getGlobalId()).get(); return true; }); diff --git a/integration-tests/src/test/java/io/apicurio/tests/smokeTests/apicurio/ArtifactsIT.java b/integration-tests/src/test/java/io/apicurio/tests/smokeTests/apicurio/ArtifactsIT.java index 70def247da..850bb8b750 100644 --- a/integration-tests/src/test/java/io/apicurio/tests/smokeTests/apicurio/ArtifactsIT.java +++ b/integration-tests/src/test/java/io/apicurio/tests/smokeTests/apicurio/ArtifactsIT.java @@ -76,7 +76,7 @@ void createAndUpdateArtifact() throws Exception { VersionMetaData amd1 = createArtifact(groupId, artifactId, ArtifactType.AVRO, IoUtil.toStream(artifactData)); LOGGER.info("Created artifact {} with metadata {}", artifactId, amd1.toString()); - InputStream latest = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); + InputStream latest = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get(); JsonNode response = mapper.readTree(latest); LOGGER.info("Artifact with name:{} and content:{} was created", response.get("name").asText(), response); @@ -101,7 +101,7 @@ void createAndUpdateArtifact() throws Exception { // Make sure artifact is fully registered retryOp((rc) -> rc.ids().globalIds().byGlobalId(metaData.getGlobalId()).get()); - latest = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); + latest = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get(); response = mapper.readTree(latest); LOGGER.info("Artifact with ID {} was updated: {}", artifactId, response); @@ -111,7 +111,7 @@ void createAndUpdateArtifact() throws Exception { LOGGER.info("Available versions of artifact with ID {} are: {}", artifactId, apicurioVersions.toString()); assertThat(apicurioVersions, hasItems("1", "2")); - InputStream version1 = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").get(); + InputStream version1 = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").content().get(); response = mapper.readTree(version1); LOGGER.info("Artifact with ID {} and version {}: {}", artifactId, 1, response); @@ -157,7 +157,7 @@ void createNonAvroArtifact() throws Exception { LOGGER.info("Created artifact {} with metadata {}", artifactId, amd); - InputStream latest = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); + InputStream latest = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").content().get(); JsonNode response = mapper.readTree(latest); LOGGER.info("Got info about artifact with ID {}: {}", artifactId, response); @@ -229,40 +229,40 @@ void testDisableEnableArtifactVersion() throws Exception { VersionMetaData v3MD = createArtifactVersion(groupId, artifactId, IoUtil.toStream(artifactDataV3)); // Disable v3 - registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v3MD.getVersion())).meta().put(toEditableVersionMetaData(VersionState.DISABLED)); + registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v3MD.getVersion())).put(toEditableVersionMetaData(VersionState.DISABLED)); // Verify artifact retryOp((rc) -> { - VersionMetaData actualMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData actualMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); assertEquals("2", actualMD.getVersion()); // Verify v1 - VersionMetaData actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v1MD.getVersion())).meta().get(); + VersionMetaData actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v1MD.getVersion())).get(); assertEquals(VersionState.ENABLED, actualVMD.getState()); // Verify v2 - actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v2MD.getVersion())).meta().get(); + actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v2MD.getVersion())).get(); assertEquals(VersionState.ENABLED, actualVMD.getState()); // Verify v3 - actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v3MD.getVersion())).meta().get(); + actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v3MD.getVersion())).get(); assertEquals(VersionState.DISABLED, actualVMD.getState()); }); // Re-enable v3 - registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v3MD.getVersion())).meta().put(toEditableVersionMetaData(VersionState.ENABLED)); + registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v3MD.getVersion())).put(toEditableVersionMetaData(VersionState.ENABLED)); retryOp((rc) -> { // Verify artifact (now v3) - VersionMetaData actualMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").meta().get(); + VersionMetaData actualMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("branch=latest").get(); assertEquals("3", actualMD.getVersion()); // version 2 is active (3 is disabled) // Verify v1 - VersionMetaData actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v1MD.getVersion())).meta().get(); + VersionMetaData actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v1MD.getVersion())).get(); assertEquals(VersionState.ENABLED, actualVMD.getState()); // Verify v2 - actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v2MD.getVersion())).meta().get(); + actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v2MD.getVersion())).get(); assertEquals(VersionState.ENABLED, actualVMD.getState()); // Verify v3 - actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v3MD.getVersion())).meta().get(); + actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v3MD.getVersion())).get(); assertEquals(VersionState.ENABLED, actualVMD.getState()); }); } @@ -286,17 +286,17 @@ void testDeprecateArtifactVersion() throws Exception { VersionMetaData v3MD = createArtifactVersion(groupId, artifactId, IoUtil.toStream(artifactDataV3)); // Deprecate v2 - registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v2MD.getVersion())).meta().put(toEditableVersionMetaData(VersionState.DEPRECATED)); + registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v2MD.getVersion())).put(toEditableVersionMetaData(VersionState.DEPRECATED)); retryOp((rc) -> { // Verify v1 - VersionMetaData actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v1MD.getVersion())).meta().get(); + VersionMetaData actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v1MD.getVersion())).get(); assertEquals(VersionState.ENABLED, actualVMD.getState()); // Verify v2 - actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v2MD.getVersion())).meta().get(); + actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v2MD.getVersion())).get(); assertEquals(VersionState.DEPRECATED, actualVMD.getState()); // Verify v3 - actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v3MD.getVersion())).meta().get(); + actualVMD = rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(String.valueOf(v3MD.getVersion())).get(); assertEquals(VersionState.ENABLED, actualVMD.getState()); }); } diff --git a/integration-tests/src/test/java/io/apicurio/tests/smokeTests/apicurio/MetadataIT.java b/integration-tests/src/test/java/io/apicurio/tests/smokeTests/apicurio/MetadataIT.java index 91705d841a..9aef81b4b7 100644 --- a/integration-tests/src/test/java/io/apicurio/tests/smokeTests/apicurio/MetadataIT.java +++ b/integration-tests/src/test/java/io/apicurio/tests/smokeTests/apicurio/MetadataIT.java @@ -82,9 +82,9 @@ void getAndUpdateMetadataOfArtifactSpecificVersion() throws Exception { metaData = createArtifactVersion(groupId, artifactId, artifactUpdateData); LOGGER.info("Artifact with ID {} was updated: {}", artifactId, metaData); - retryOp((rc) -> rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("2").meta().get()); + retryOp((rc) -> rc.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("2").get()); - VersionMetaData versionMetaData = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("2").meta().get(); + VersionMetaData versionMetaData = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("2").get(); LOGGER.info("Got metadata of artifact with ID {}: {}", artifactId, versionMetaData); @@ -95,9 +95,9 @@ void getAndUpdateMetadataOfArtifactSpecificVersion() throws Exception { emd.setName("Artifact Updated Name"); emd.setDescription("The description of the artifact."); - registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("2").meta().put(emd); + registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("2").put(emd); - versionMetaData = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").meta().get(); + versionMetaData = registryClient.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").get(); LOGGER.info("Got metadata of artifact with ID {} version 1: {}", artifactId, versionMetaData); assertThat(versionMetaData.getVersion(), is("1")); diff --git a/integration-tests/src/test/java/io/apicurio/tests/smokeTests/confluent/SchemasConfluentIT.java b/integration-tests/src/test/java/io/apicurio/tests/smokeTests/confluent/SchemasConfluentIT.java index ee0daf2fb9..e1c3b3f275 100644 --- a/integration-tests/src/test/java/io/apicurio/tests/smokeTests/confluent/SchemasConfluentIT.java +++ b/integration-tests/src/test/java/io/apicurio/tests/smokeTests/confluent/SchemasConfluentIT.java @@ -213,7 +213,7 @@ void testCreateDeleteSchemaRuleIsDeleted() throws Exception { TestUtils.waitFor("artifact created", Constants.POLL_INTERVAL, Constants.TIMEOUT_GLOBAL, () -> { try { - return registryClient.groups().byGroupId("default").artifacts().byArtifactId(subjectName).versions().byVersionExpression("branch=latest").get().readAllBytes().length > 0; + return registryClient.groups().byGroupId("default").artifacts().byArtifactId(subjectName).versions().byVersionExpression("branch=latest").content().get().readAllBytes().length > 0; } catch (WebApplicationException e) { return false; } catch (IOException e) { diff --git a/schema-resolver/src/main/java/io/apicurio/registry/resolver/AbstractSchemaResolver.java b/schema-resolver/src/main/java/io/apicurio/registry/resolver/AbstractSchemaResolver.java index 40004107f1..55a5077a1e 100644 --- a/schema-resolver/src/main/java/io/apicurio/registry/resolver/AbstractSchemaResolver.java +++ b/schema-resolver/src/main/java/io/apicurio/registry/resolver/AbstractSchemaResolver.java @@ -204,7 +204,7 @@ protected SchemaLookupResult resolveSchemaByGlobalId(long globalId) { protected Map> resolveReferences(List artifactReferences) { Map> resolvedReferences = new HashMap<>(); artifactReferences.forEach(reference -> { - final InputStream referenceContent = client.groups().byGroupId(reference.getGroupId() == null ? "default" : reference.getGroupId()).artifacts().byArtifactId(reference.getArtifactId()).versions().byVersionExpression(reference.getVersion()).get(); + final InputStream referenceContent = client.groups().byGroupId(reference.getGroupId() == null ? "default" : reference.getGroupId()).artifacts().byArtifactId(reference.getArtifactId()).versions().byVersionExpression(reference.getVersion()).content().get(); final List referenceReferences = client .groups() .byGroupId(reference.getGroupId() == null ? "default" : reference.getGroupId()) // TODO verify the old logic: .pathParams(List.of(groupId == null ? "null" : groupId, artifactId, version)) GroupRequestsProvider.java diff --git a/schema-resolver/src/main/java/io/apicurio/registry/resolver/DefaultSchemaResolver.java b/schema-resolver/src/main/java/io/apicurio/registry/resolver/DefaultSchemaResolver.java index 2939a07eab..1f39792ac3 100644 --- a/schema-resolver/src/main/java/io/apicurio/registry/resolver/DefaultSchemaResolver.java +++ b/schema-resolver/src/main/java/io/apicurio/registry/resolver/DefaultSchemaResolver.java @@ -384,7 +384,7 @@ private SchemaLookupResult resolveByCoordinates(String groupId, String artifa S parsed = null; byte[] schema = null; Long gid; - VersionMetaData metadata = client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(version).meta().get(); + VersionMetaData metadata = client.groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(version).get(); loadFromArtifactMetaData(metadata, result); gid = metadata.getGlobalId(); diff --git a/utils/maven-plugin/src/main/java/io/apicurio/registry/maven/DownloadRegistryMojo.java b/utils/maven-plugin/src/main/java/io/apicurio/registry/maven/DownloadRegistryMojo.java index 57371ac667..51e974baef 100644 --- a/utils/maven-plugin/src/main/java/io/apicurio/registry/maven/DownloadRegistryMojo.java +++ b/utils/maven-plugin/src/main/java/io/apicurio/registry/maven/DownloadRegistryMojo.java @@ -90,7 +90,7 @@ private int downloadArtifact(DownloadArtifact artifact) throws ExecutionExceptio getLog().info(String.format("Downloading artifact [%s] / [%s] (version %s).", groupId, artifactId, version)); - try (InputStream content = getClient().groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(version).get()) { + try (InputStream content = getClient().groups().byGroupId(groupId).artifacts().byArtifactId(artifactId).versions().byVersionExpression(version).content().get()) { if (!artifact.getFile().getParentFile().exists()) { artifact.getFile().getParentFile().mkdirs(); diff --git a/utils/maven-plugin/src/main/java/io/apicurio/registry/maven/RegisterRegistryMojo.java b/utils/maven-plugin/src/main/java/io/apicurio/registry/maven/RegisterRegistryMojo.java index e1976fc66b..f5fc2609be 100644 --- a/utils/maven-plugin/src/main/java/io/apicurio/registry/maven/RegisterRegistryMojo.java +++ b/utils/maven-plugin/src/main/java/io/apicurio/registry/maven/RegisterRegistryMojo.java @@ -339,7 +339,7 @@ private void addExistingReferencesToIndex(ReferenceIndex index, List Date: Mon, 22 Apr 2024 16:49:41 -0400 Subject: [PATCH 2/8] Fix artifact util --- .../src/test/java/io/apicurio/tests/utils/ArtifactUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/src/test/java/io/apicurio/tests/utils/ArtifactUtils.java b/integration-tests/src/test/java/io/apicurio/tests/utils/ArtifactUtils.java index 2070bbd0a0..7b9d536f57 100644 --- a/integration-tests/src/test/java/io/apicurio/tests/utils/ArtifactUtils.java +++ b/integration-tests/src/test/java/io/apicurio/tests/utils/ArtifactUtils.java @@ -12,7 +12,7 @@ public class ArtifactUtils { public static Response getArtifact(String groupId, String artifactId, String version, int returnCode) { return - BaseHttpUtils.getRequest(RestConstants.JSON, ApicurioRegistryBaseIT.getRegistryV3ApiUrl() + "/groups/" + encodeURIComponent(groupId) + "/artifacts/" + encodeURIComponent(artifactId) + "/versions/" + version, returnCode); + BaseHttpUtils.getRequest(RestConstants.JSON, ApicurioRegistryBaseIT.getRegistryV3ApiUrl() + "/groups/" + encodeURIComponent(groupId) + "/artifacts/" + encodeURIComponent(artifactId) + "/versions/" + version + "/content", returnCode); } public static Response createArtifact(String groupId, String artifactId, String artifact, int returnCode) { From 394cbb12b247fd810799845636c486d63be7b396 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Mon, 22 Apr 2024 16:56:42 -0400 Subject: [PATCH 3/8] Build examples in verify workflow. Fix broken examples --- .github/workflows/verify.yaml | 38 ++++++++++++++++--- .../simple/protobuf/ProtobufBeanExample.java | 2 +- .../avro/maven/SimpleAvroMavenExample.java | 2 +- .../protobuf/SimpleProtobufExample.java | 2 +- .../simple/json/MessageValidator.java | 2 +- 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index da893a34e4..7608664f88 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -27,7 +27,7 @@ env: jobs: build-verify: name: Verify Application Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: github.repository_owner == 'Apicurio' && !contains(github.event.*.labels.*.name, 'DO NOT MERGE') steps: - name: Checkout Code with Ref '${{ github.ref }}' @@ -109,7 +109,7 @@ jobs: build-verify-ui: name: Verify UI Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: github.repository_owner == 'Apicurio' && !contains(github.event.*.labels.*.name, 'DO NOT MERGE') steps: - name: Checkout Code with Ref '${{ github.ref }}' @@ -198,10 +198,36 @@ jobs: url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_ERRORS }} status: ${{ job.status }} + build-verify-examples: + name: Verify Examples + runs-on: ubuntu-latest + if: github.repository_owner == 'Apicurio' && !contains(github.event.*.labels.*.name, 'DO NOT MERGE') + steps: + - name: Checkout Code with Ref '${{ github.ref }}' + uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'temurin' + cache: 'maven' + + - name: Build Examples + run: ./mvnw clean compile --no-transfer-progress -DskipTests=true + + - name: Google Chat Notification (Error) + if: github.event_name == 'push' && failure() + uses: Co-qn/google-chat-notification@b9227d9daa4638c9782a5bd16c4abb86268127a1 + with: + name: ${{ github.job }} + url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_ERRORS }} + status: ${{ job.status }} + build-native-images: name: Build and Test Native images - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: github.repository_owner == 'Apicurio' && !contains(github.event.*.labels.*.name, 'DO NOT MERGE') steps: - name: Checkout Code with Ref '${{ github.ref }}' @@ -305,7 +331,7 @@ jobs: build-verify-python-sdk: name: Verify Python SDK - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest # if: github.repository_owner == 'Apicurio' && !contains(github.event.*.labels.*.name, 'DO NOT MERGE') steps: - name: Checkout Code with Ref '${{ github.ref }}' @@ -342,7 +368,7 @@ jobs: build-verify-go-sdk: name: Verify Go SDK - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest # if: github.repository_owner == 'Apicurio' && !contains(github.event.*.labels.*.name, 'DO NOT MERGE') steps: - name: Checkout Code with Ref '${{ github.ref }}' @@ -369,7 +395,7 @@ jobs: notify-sdk: if: github.repository_owner == 'Apicurio' && github.event_name == 'push' && github.ref == 'refs/heads/main' && !contains(github.event.*.labels.*.name, 'DO NOT MERGE') - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: language: [ js ] diff --git a/examples/protobuf-bean/src/main/java/io/apicurio/registry/examples/simple/protobuf/ProtobufBeanExample.java b/examples/protobuf-bean/src/main/java/io/apicurio/registry/examples/simple/protobuf/ProtobufBeanExample.java index b956f7947e..67970ae6d4 100644 --- a/examples/protobuf-bean/src/main/java/io/apicurio/registry/examples/simple/protobuf/ProtobufBeanExample.java +++ b/examples/protobuf-bean/src/main/java/io/apicurio/registry/examples/simple/protobuf/ProtobufBeanExample.java @@ -139,7 +139,7 @@ public static final void main(String[] args) throws Exception { RegistryClient client = new RegistryClient(vertXRequestAdapter); System.out.println("The artifact created in Apicurio Registry is: "); //because the default ArtifactResolverStrategy is TopicIdStrategy the artifactId is in the form of topicName-value - System.out.println(IoUtil.toString(client.groups().byGroupId("default").artifacts().byArtifactId(topicName + "-value").versions().byVersionExpression("1").get())); + System.out.println(IoUtil.toString(client.groups().byGroupId("default").artifacts().byArtifactId(topicName + "-value").versions().byVersionExpression("1").content().get())); System.out.println(); VertXAuthFactory.defaultVertx.close(); System.out.println("Done (success)."); diff --git a/examples/simple-avro-maven/src/main/java/io/apicurio/registry/examples/simple/avro/maven/SimpleAvroMavenExample.java b/examples/simple-avro-maven/src/main/java/io/apicurio/registry/examples/simple/avro/maven/SimpleAvroMavenExample.java index 037cfeaa9b..e672a54852 100644 --- a/examples/simple-avro-maven/src/main/java/io/apicurio/registry/examples/simple/avro/maven/SimpleAvroMavenExample.java +++ b/examples/simple-avro-maven/src/main/java/io/apicurio/registry/examples/simple/avro/maven/SimpleAvroMavenExample.java @@ -96,7 +96,7 @@ public static final void main(String[] args) throws Exception { String schemaData = null; - try (InputStream latestArtifact = client.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").get()) { + try (InputStream latestArtifact = client.groups().byGroupId("default").artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").content().get()) { schemaData = toString(latestArtifact); } catch (ApiException e) { System.err.println("Schema not registered in registry. Before running this example, please do:"); diff --git a/examples/simple-protobuf/src/main/java/io/apicurio/registry/examples/simple/protobuf/SimpleProtobufExample.java b/examples/simple-protobuf/src/main/java/io/apicurio/registry/examples/simple/protobuf/SimpleProtobufExample.java index 7481d057c1..450ecbeb5d 100644 --- a/examples/simple-protobuf/src/main/java/io/apicurio/registry/examples/simple/protobuf/SimpleProtobufExample.java +++ b/examples/simple-protobuf/src/main/java/io/apicurio/registry/examples/simple/protobuf/SimpleProtobufExample.java @@ -141,7 +141,7 @@ public static final void main(String[] args) throws Exception { RegistryClient client = new RegistryClient(vertXRequestAdapter); System.out.println("The artifact created in Apicurio Registry is: "); //because the default ArtifactResolverStrategy is TopicIdStrategy the artifactId is in the form of topicName-value - System.out.println(IoUtil.toString(client.groups().byGroupId("default").artifacts().byArtifactId(topicName + "-value").versions().byVersionExpression("1").get())); + System.out.println(IoUtil.toString(client.groups().byGroupId("default").artifacts().byArtifactId(topicName + "-value").versions().byVersionExpression("1").content().get())); System.out.println(); VertXAuthFactory.defaultVertx.close(); System.out.println("Done (success)."); diff --git a/examples/simple-validation/src/main/java/io/apicurio/registry/examples/simple/json/MessageValidator.java b/examples/simple-validation/src/main/java/io/apicurio/registry/examples/simple/json/MessageValidator.java index 63134b2073..3fbe079204 100644 --- a/examples/simple-validation/src/main/java/io/apicurio/registry/examples/simple/json/MessageValidator.java +++ b/examples/simple-validation/src/main/java/io/apicurio/registry/examples/simple/json/MessageValidator.java @@ -58,7 +58,7 @@ public MessageValidator(String registryUrl, String group, String artifactId) { */ public void validate(MessageBean message) throws IOException, ValidationException { JSONObject jsonSchema; - try (InputStream schemaIS = client.groups().byGroupId(group).artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").get()) { + try (InputStream schemaIS = client.groups().byGroupId(group).artifacts().byArtifactId(artifactId).versions().byVersionExpression("1").content().get()) { jsonSchema = new JSONObject(new JSONTokener(schemaIS)); } From c2b0c10a797c7d24677bc93df95fbc7e036b28b1 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Mon, 22 Apr 2024 17:15:01 -0400 Subject: [PATCH 4/8] Remove examples build from verify --- .github/workflows/verify.yaml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index 7608664f88..fb7309af53 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -198,32 +198,6 @@ jobs: url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_ERRORS }} status: ${{ job.status }} - build-verify-examples: - name: Verify Examples - runs-on: ubuntu-latest - if: github.repository_owner == 'Apicurio' && !contains(github.event.*.labels.*.name, 'DO NOT MERGE') - steps: - - name: Checkout Code with Ref '${{ github.ref }}' - uses: actions/checkout@v3 - - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: 'temurin' - cache: 'maven' - - - name: Build Examples - run: ./mvnw clean compile --no-transfer-progress -DskipTests=true - - - name: Google Chat Notification (Error) - if: github.event_name == 'push' && failure() - uses: Co-qn/google-chat-notification@b9227d9daa4638c9782a5bd16c4abb86268127a1 - with: - name: ${{ github.job }} - url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_ERRORS }} - status: ${{ job.status }} - build-native-images: name: Build and Test Native images From cbbbb5820c83834c61e2ad2afd38b0e6c4712841 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Mon, 22 Apr 2024 17:39:15 -0400 Subject: [PATCH 5/8] Fix UI usage of rest api --- ui/ui-app/src/services/useGroupsService.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/ui-app/src/services/useGroupsService.ts b/ui/ui-app/src/services/useGroupsService.ts index 6a02ff2534..02755f14ad 100644 --- a/ui/ui-app/src/services/useGroupsService.ts +++ b/ui/ui-app/src/services/useGroupsService.ts @@ -159,7 +159,7 @@ const getArtifactVersionMetaData = async (config: ConfigService, auth: AuthServi const baseHref: string = config.artifactsUrl(); const token: string | undefined = await auth.getToken(); const versionExpression: string = (version == "latest") ? "branch=latest" : version; - const endpoint: string = createEndpoint(baseHref, "/groups/:groupId/artifacts/:artifactId/versions/:versionExpression/meta", + const endpoint: string = createEndpoint(baseHref, "/groups/:groupId/artifacts/:artifactId/versions/:versionExpression", { groupId, artifactId, versionExpression }); const options = createOptions(createHeaders(token)); return httpGet(endpoint, options); @@ -196,7 +196,7 @@ const updateArtifactVersionMetaData = async (config: ConfigService, auth: AuthSe const baseHref: string = config.artifactsUrl(); const token: string | undefined = await auth.getToken(); const versionExpression: string = (version == "latest") ? "branch=latest" : version; - const endpoint: string = createEndpoint(baseHref, "/groups/:groupId/artifacts/:artifactId/versions/:versionExpression/meta", + const endpoint: string = createEndpoint(baseHref, "/groups/:groupId/artifacts/:artifactId/versions/:versionExpression", { groupId, artifactId, versionExpression }); const options = createOptions(createHeaders(token)); return httpPut(endpoint, metaData, options); @@ -214,7 +214,7 @@ const getArtifactVersionContent = async (config: ConfigService, auth: AuthServic const baseHref: string = config.artifactsUrl(); const token: string | undefined = await auth.getToken(); const versionExpression: string = (version == "latest") ? "branch=latest" : version; - const endpoint: string = createEndpoint(baseHref, "/groups/:groupId/artifacts/:artifactId/versions/:versionExpression", + const endpoint: string = createEndpoint(baseHref, "/groups/:groupId/artifacts/:artifactId/versions/:versionExpression/content", { groupId, artifactId, versionExpression }); const headers: any = createHeaders(token); From 48d487ef4598c23036e47b3245d14c5a520eea3b Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Mon, 22 Apr 2024 21:12:06 -0400 Subject: [PATCH 6/8] Fix failing python test --- python-sdk/tests/basic_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python-sdk/tests/basic_test.py b/python-sdk/tests/basic_test.py index 217f00155e..45f3f4b8ce 100644 --- a/python-sdk/tests/basic_test.py +++ b/python-sdk/tests/basic_test.py @@ -94,6 +94,7 @@ async def test_basic_upload_download(): await client.groups.by_group_id("default") .artifacts.by_artifact_id(meta_data.artifact_id) .versions.by_version_expression("branch=latest") + .content() .get() ) print(str(return_artifact, "utf-8")) From 665adb8a06778d0d6a096b3482dc4721a4872aa7 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Tue, 23 Apr 2024 08:08:32 -0400 Subject: [PATCH 7/8] Fix python sdk basic test --- python-sdk/tests/basic_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-sdk/tests/basic_test.py b/python-sdk/tests/basic_test.py index 45f3f4b8ce..e2ed165e01 100644 --- a/python-sdk/tests/basic_test.py +++ b/python-sdk/tests/basic_test.py @@ -94,7 +94,7 @@ async def test_basic_upload_download(): await client.groups.by_group_id("default") .artifacts.by_artifact_id(meta_data.artifact_id) .versions.by_version_expression("branch=latest") - .content() + .content .get() ) print(str(return_artifact, "utf-8")) From 7335ef569934baebb282e1ce3fbc1b51ab2b20ea Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Tue, 23 Apr 2024 08:35:56 -0400 Subject: [PATCH 8/8] Fix linting issue in python sdk test --- python-sdk/tests/basic_test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-sdk/tests/basic_test.py b/python-sdk/tests/basic_test.py index e2ed165e01..956c69de53 100644 --- a/python-sdk/tests/basic_test.py +++ b/python-sdk/tests/basic_test.py @@ -94,8 +94,7 @@ async def test_basic_upload_download(): await client.groups.by_group_id("default") .artifacts.by_artifact_id(meta_data.artifact_id) .versions.by_version_expression("branch=latest") - .content - .get() + .content.get() ) print(str(return_artifact, "utf-8")) assert json.loads(return_artifact) == json.loads(payload.content)