From d2b3545fbf79bca0f69de384414ee778fe1b8094 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 19 Mar 2024 01:29:50 +0100
Subject: [PATCH] WIP: more info on profiles
---
api/pom.xml | 2 +-
api/src/main/resources/api.yaml | 7 +++++++
application/pom.xml | 2 +-
.../fdo/manager/service/fdo/ProfilesApiImpl.java | 6 +++++-
.../fdo/manager/service/mock/MockManager.java | 14 ++++++++++++--
pom.xml | 2 +-
6 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 6edfb76..64fb2f7 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 9dff4e4..17112c0 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 833903d..8f37e54 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 52db568..0ded1ea 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 b28eb8c..23376b2 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 5a331db..ef07c33 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>
--
GitLab