diff --git a/api/pom.xml b/api/pom.xml index a54e15ed6df7696deeb523fcd690b34ef2f2a65b..2dafadb96cf9f6ac99e7a73c3d249e99d3f97e6f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>com.indiscale.fdo</groupId> <artifactId>fdo-manager-service</artifactId> - <version>0.1.0-rc6</version> + <version>0.1.0-rc7</version> <relativePath>../pom.xml</relativePath> </parent> <properties> diff --git a/api/src/main/resources/api.yaml b/api/src/main/resources/api.yaml index ba826efc5cd47c74a7181fd024ea8abb34df3cee..6c7faf35f62307078b2d608f5238f1e5365ce919 100644 --- a/api/src/main/resources/api.yaml +++ b/api/src/main/resources/api.yaml @@ -335,7 +335,6 @@ components: nullable: true RepositoryID: type: string - nullable: true examples: - "gwdg-cordra-1" - "fdo.indiscale.com" @@ -347,10 +346,12 @@ components: $ref: '#/components/schemas/RepositoryID' type: type: string - enum: ["Repository"] + enum: ["repositories"] attributes: type: object properties: + type: + type: string description: type: string maintainer: @@ -362,7 +363,6 @@ components: $ref: '#/components/schemas/Links' ProfileID: type: string - nullable: true Profile: type: object properties: diff --git a/application/pom.xml b/application/pom.xml index bb00669bbc723a7b02fd62cdf5460a4a5d24a9bb..84ad4c5c9eb3f381b094bd82d2ff06cd06f2983b 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>com.indiscale.fdo</groupId> <artifactId>fdo-manager-service</artifactId> - <version>0.1.0-rc6</version> + <version>0.1.0-rc7</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -80,9 +80,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <version>3.3.1</version> - <configuration> - <filtering>true</filtering> - </configuration> </plugin> <plugin> <groupId>org.springframework.boot</groupId> diff --git a/application/src/main/java/com/indiscale/fdo/manager/service/repositories/RepositoriesImpl.java b/application/src/main/java/com/indiscale/fdo/manager/service/repositories/RepositoriesImpl.java index a881714fb339226f8a553a7cb35001886f802e84..91f56a5dfe42ff5062e6b7bd08e8f6ad1ca25772 100644 --- a/application/src/main/java/com/indiscale/fdo/manager/service/repositories/RepositoriesImpl.java +++ b/application/src/main/java/com/indiscale/fdo/manager/service/repositories/RepositoriesImpl.java @@ -31,9 +31,11 @@ public class RepositoriesImpl extends BaseController implements RepositoriesApi public Repository(RepositoryConfig config) { this.setId(config.getId()); + this.setType(TypeEnum.REPOSITORIES); RepositoryAttributes attr = new RepositoryAttributes(); attr.setDescription(config.getDescription()); attr.setMaintainer(config.getMaintainer()); + attr.setType(config.getType().id); this.setAttributes(attr); } diff --git a/application/src/test/java/com/indiscale/fdo/manager/service/repositories/RepositoriesTest.java b/application/src/test/java/com/indiscale/fdo/manager/service/repositories/RepositoriesTest.java index b803b4b0ddf1cface4edd2aa27aa59d1df9c1950..66abade365b08ffb6ba406c6a9bf6b8f262ea10d 100644 --- a/application/src/test/java/com/indiscale/fdo/manager/service/repositories/RepositoriesTest.java +++ b/application/src/test/java/com/indiscale/fdo/manager/service/repositories/RepositoriesTest.java @@ -1,5 +1,10 @@ package com.indiscale.fdo.manager.service.repositories; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import com.indiscale.fdo.manager.api.Manager; +import com.indiscale.fdo.manager.mock.MockManager; +import com.indiscale.fdo.manager.service.api.model.Repository.TypeEnum; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -12,7 +17,14 @@ import org.springframework.boot.test.web.server.LocalServerPort; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class RepositoriesTest { - @Autowired private RepositoriesImpl repositories; + public static class TestRepositoriesImpl extends RepositoriesImpl { + @Override + public Manager getManager() { + return new MockManager(); + } + } + + private RepositoriesImpl repositories = new TestRepositoriesImpl(); @LocalServerPort private int port; @@ -22,8 +34,9 @@ public class RepositoriesTest { private String contextPath; @Test - void index() { + void indexMockManager() { Assertions.assertThat(repositories).isNotNull(); + assertEquals(repositories.listRepositories().getBody().getData().size(), 3); } @Test @@ -33,4 +46,11 @@ public class RepositoriesTest { "http://localhost:" + port + contextPath + "/repositories", String.class)) .contains("data"); } + + @Test + void resourceTypeNotNull() { + assertEquals( + repositories.listRepositories().getBody().getData().get(0).getType(), + TypeEnum.REPOSITORIES); + } } diff --git a/pom.xml b/pom.xml index 5884ad8a6b85f94819d13541ff74c6703031da08..e42e62e523a860a6df9b86ba83c595bf7bc48956 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>3.2.3</version> + <version>3.3.1</version> </parent> <groupId>com.indiscale.fdo</groupId> <artifactId>fdo-manager-service</artifactId> <packaging>pom</packaging> - <version>0.1.0-rc6</version> + <version>0.1.0-rc7</version> <modules> <module>api</module> <module>application</module>