diff --git a/generated/src/main/resources/pom.xml b/generated/src/main/resources/pom.xml index ea43abb..f6f5bd7 100644 --- a/generated/src/main/resources/pom.xml +++ b/generated/src/main/resources/pom.xml @@ -19,7 +19,7 @@ 4.0.0 io.dockstore swagger-java-zenodo-client - 2.0.5-SNAPSHOT + 2.1.3-SNAPSHOT Apache Software License, Version 2.0 diff --git a/pom.xml b/pom.xml index 4a8d1f4..916db05 100644 --- a/pom.xml +++ b/pom.xml @@ -26,11 +26,10 @@ scm:git:git@github.com:dockstore/swagger-java-zenodo-client.git UTF-8 - 1.15.0-beta.0 + 1.16.0-alpha.13 2.21.0 - 2.21.0 + 3.4.0 ${java.home}/bin/javadoc - 4.12 3.0.11 diff --git a/src/main/resources/zenodo-1.0.0-swagger-2.0.yaml b/src/main/resources/zenodo-1.0.0-swagger-2.0.yaml index fede97a..4feee3a 100644 --- a/src/main/resources/zenodo-1.0.0-swagger-2.0.yaml +++ b/src/main/resources/zenodo-1.0.0-swagger-2.0.yaml @@ -1023,6 +1023,8 @@ definitions: type: string doi_url: type: string + conceptdoi: + type: string metadata: type: object properties: diff --git a/src/test/java/io/dockstore/ZenodoClientTest.java b/src/test/java/io/dockstore/ZenodoClientTest.java index 424ffea..3c801c0 100644 --- a/src/test/java/io/dockstore/ZenodoClientTest.java +++ b/src/test/java/io/dockstore/ZenodoClientTest.java @@ -1,19 +1,39 @@ package io.dockstore; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import io.swagger.zenodo.client.ApiClient; +import io.swagger.zenodo.client.ApiException; +import io.swagger.zenodo.client.api.PreviewApi; +import io.swagger.zenodo.client.model.SearchResult; import java.util.HashMap; - - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class ZenodoClientTest { - @org.junit.jupiter.api.Test - public void testZenodoClient() throws io.swagger.zenodo.client.ApiException { - io.swagger.zenodo.client.ApiClient client = new io.swagger.zenodo.client.ApiClient(); + private ApiClient client; + private PreviewApi previewApi; + + @BeforeEach + void setup() { + client = new ApiClient(); client.setBasePath("https://sandbox.zenodo.org/api"); - io.swagger.zenodo.client.api.PreviewApi previewApi = new io.swagger.zenodo.client.api.PreviewApi(client); + previewApi = new io.swagger.zenodo.client.api.PreviewApi(client); + } + + @Test + @Disabled("Test disabled as the communities API is failing on sandbox") + public void testZenodoClient() throws ApiException { HashMap o = (HashMap)previewApi.listCommunities(); assertTrue(o != null && !o.keySet().isEmpty(), "not able to list communities as basic test"); } + + @Test + void testConceptDoi() { + final SearchResult searchResult = previewApi.listRecords(null, "bestmatch", 1, 100); + assertNotNull(searchResult.getHits().getHits().get(0).getConceptdoi()); + } } \ No newline at end of file