diff --git a/api/pom.xml b/api/pom.xml index 6edfb76a4fb035c32f807dfd108e84b6f9515310..64fb2f7621ef6c6a86480f0ed63ebad04801c76b 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-rc2</version> + <version>0.1.0-rc3</version> <relativePath>../pom.xml</relativePath> </parent> <properties> diff --git a/api/src/main/resources/api.yaml b/api/src/main/resources/api.yaml index 9dff4e4b4ca554846f236eaf95816d2a8916a723..17112c00e1203f273a9fcf9a01688eb99575760b 100644 --- a/api/src/main/resources/api.yaml +++ b/api/src/main/resources/api.yaml @@ -357,6 +357,13 @@ components: properties: id: $ref: '#/components/schemas/ProfileID' + attributes: + type: object + properties: + name: + object: string + description: + object: string links: $ref: '#/components/schemas/Links' Hello: diff --git a/application/pom.xml b/application/pom.xml index 833903d5fbb79ad7e14d406f5ff96977c384d282..8f37e5460d170a516607df8705a00ecd70e555e1 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-rc2</version> + <version>0.1.0-rc3</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/application/src/main/java/com/indiscale/fdo/manager/service/fdo/ProfilesApiImpl.java b/application/src/main/java/com/indiscale/fdo/manager/service/fdo/ProfilesApiImpl.java index 52db5683390c4d1509021476b6500b120da2afac..0ded1ea42da86833fe6ffc11071af874d6b9051f 100644 --- a/application/src/main/java/com/indiscale/fdo/manager/service/fdo/ProfilesApiImpl.java +++ b/application/src/main/java/com/indiscale/fdo/manager/service/fdo/ProfilesApiImpl.java @@ -7,6 +7,7 @@ import com.indiscale.fdo.manager.service.api.model.GetProfile200Response; import com.indiscale.fdo.manager.service.api.model.Links; import com.indiscale.fdo.manager.service.api.model.ListProfiles200Response; import com.indiscale.fdo.manager.service.api.model.Profile; +import com.indiscale.fdo.manager.service.api.model.ProfileAttributes; import com.indiscale.fdo.manager.service.api.operation.ProfilesApi; import java.util.List; import org.springframework.http.ResponseEntity; @@ -18,7 +19,10 @@ import org.springframework.web.bind.annotation.RestController; public class ProfilesApiImpl extends BaseController implements ProfilesApi { private Profile toProfile(FdoProfile p) { - return new Profile().id(p.getId()); + ProfileAttributes attr = new ProfileAttributes(); + attr.description(p.getDescription()); + attr.name(p.getName()); + return new Profile().id(p.getId()).attributes(attr); } @Override diff --git a/application/src/main/java/com/indiscale/fdo/manager/service/mock/MockManager.java b/application/src/main/java/com/indiscale/fdo/manager/service/mock/MockManager.java index b28eb8cca7c5f5545079d1972f4c6b923ae63e7a..23376b212e39fcab1f1866a7bd9c575b9e1bf71a 100644 --- a/application/src/main/java/com/indiscale/fdo/manager/service/mock/MockManager.java +++ b/application/src/main/java/com/indiscale/fdo/manager/service/mock/MockManager.java @@ -55,9 +55,9 @@ public class MockManager extends DefaultManager { e.printStackTrace(); } DefaultProfileRegistry<FdoProfile> profileRegistry = getProfileRegistry(); - profileRegistry.registerProfile(createFdoProfile("mock-profile-1")); + profileRegistry.registerProfile(createFdoProfile("0.prefix/mock-profile-1")); try { - setDefaultProfile("mock-profile-1"); + setDefaultProfile("0.prefix/mock-profile-1"); } catch (UnknownProfileException e) { e.printStackTrace(); } @@ -75,6 +75,16 @@ public class MockManager extends DefaultManager { public String getId() { return id; } + + @Override + public String getDescription() { + return "Mock-Profile Description"; + } + + @Override + public String getName() { + return "Mock-Profile"; + } }; } diff --git a/pom.xml b/pom.xml index 5a331db2bf10ec8aaae3e0e1fc0b0e41e4472a59..ef07c338a6c21e09bc3869d031eb93b2e92f230a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ <groupId>com.indiscale.fdo</groupId> <artifactId>fdo-manager-service</artifactId> <packaging>pom</packaging> - <version>0.1.0-rc2</version> + <version>0.1.0-rc3</version> <modules> <module>api</module> <module>application</module>