3.0.22 - Reintroduce constructors in Expand

saw303 · Sep 1, 2023 · dd74ed0 · dd74ed0
1 parent 5fdd47c
commit dd74ed0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ plugins {
 
 subprojects { subproject ->
 
-  version = "3.0.21"
+  version = "3.0.22"
 
   apply plugin: 'com.github.ben-manes.versions'
 

diff --git a/gradle-plugin/src/main/groovy/ch/silviowangler/gradle/restapi/RestApiPlugin.groovy b/gradle-plugin/src/main/groovy/ch/silviowangler/gradle/restapi/RestApiPlugin.groovy
@@ -105,7 +105,7 @@ class RestApiPlugin implements Plugin<Project> {
 
 		project.configurations.maybeCreate(CONFIGURATION_REST_API)
 
-		final String pluginVersion = "3.0.21"
+		final String pluginVersion = "3.0.22"
 		final String libPhoneNumberVersion = "8.11.5"
 
 		final List<String> deps = [

diff --git a/...pi-micronaut/src/main/java/ch/silviowangler/rest/micronaut/ExpandedGetResponseFilter.java b/...pi-micronaut/src/main/java/ch/silviowangler/rest/micronaut/ExpandedGetResponseFilter.java
@@ -293,8 +293,7 @@ private void attachExpandedGetsBody(
 
           Object result = executableMethod.invoke(bean, argumentList);
 
-          Expand expandedData = new Expand();
-          expandedData.setName(expandName);
+          Expand expandedData = new Expand(expandName);
 
           if (result instanceof Collection) {
             expandedData.setData((List<ResourceModel>) result);

diff --git a/rest-model/src/main/java/ch/silviowangler/rest/model/Expand.java b/rest-model/src/main/java/ch/silviowangler/rest/model/Expand.java
@@ -41,6 +41,15 @@ public class Expand {
 
   public Expand() {}
 
+  public Expand(String name) {
+    this.name = name;
+  }
+
+  public Expand(String name, List<ResourceModel> data) {
+    this.name = name;
+    this.data = data;
+  }
+
   public String getName() {
     return name;
   }