feat(#212): ensure correct spring configuration metadata is generated

Author: BlasiusSecundus

playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/PlaygroundPropertiesConfiguration.java

@@ -3,12 +3,14 @@
 import com.oembedler.moon.playground.boot.properties.PlaygroundProperties;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.validation.annotation.Validated;
 
 @Data
 @ConfigurationProperties(prefix = "graphql")
 @Validated
 public class PlaygroundPropertiesConfiguration {
 
+    @NestedConfigurationProperty
     private PlaygroundProperties playground = new PlaygroundProperties();
 }

playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/properties/PlaygroundProperties.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 import javax.validation.constraints.NotEmpty;
 import java.util.Collections;
@@ -19,15 +20,18 @@ public class PlaygroundProperties {
     @NotEmpty
     private String subscriptionEndpoint = "/subscriptions";
 
+    @NestedConfigurationProperty
     @JsonIgnore
     private PlaygroundCdn cdn = new PlaygroundCdn();
 
     @JsonIgnore
     private String pageTitle = "Playground";
 
+    @NestedConfigurationProperty
     private PlaygroundSettings settings;
 
     private Map<String, String> headers = Collections.emptyMap();
 
+    @NestedConfigurationProperty
     private List<PlaygroundTab> tabs = Collections.emptyList();
 }

playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/properties/PlaygroundSettings.java

@@ -8,23 +8,29 @@
 import com.oembedler.moon.playground.boot.properties.settings.PlaygroundSchemaSettings;
 import com.oembedler.moon.playground.boot.properties.settings.PlaygroundTracingSettings;
 import lombok.Data;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 @Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class PlaygroundSettings {
 
+    @NestedConfigurationProperty
     @JsonUnwrapped(prefix = "editor.")
     private PlaygroundEditorSettings editor;
 
+    @NestedConfigurationProperty
     @JsonUnwrapped(prefix = "prettier.")
     private PlaygroundPrettierSettings prettier;
 
+    @NestedConfigurationProperty
     @JsonUnwrapped(prefix = "request.")
     private PlaygroundRequestSettings request;
 
+    @NestedConfigurationProperty
     @JsonUnwrapped(prefix = "schema.")
     private PlaygroundSchemaSettings schema;
 
+    @NestedConfigurationProperty
     @JsonUnwrapped(prefix = "tracing.")
     private PlaygroundTracingSettings tracing;
 }

playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/properties/settings/PlaygroundSchemaSettings.java

@@ -3,13 +3,15 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import lombok.Data;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 @Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class PlaygroundSchemaSettings {
 
     private Boolean disableComments;
 
+    @NestedConfigurationProperty
     @JsonUnwrapped(prefix = "polling.")
     private PlaygroundSchemaPollingSettings polling;
 }

playground-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,39 +1,9 @@
 {
-  "groups": [
-    {
-      "name": "playground"
-    }
-  ],
   "properties": [
     {
-      "name": "playground.mapping",
+      "name": "graphql.playground.mapping",
       "defaultValue": "/playground",
       "type": "java.lang.String"
-    },
-    {
-      "name": "playground.endpoint.graphql",
-      "defaultValue": "/graphql",
-      "type": "java.lang.String"
-    },
-    {
-      "name": "playground.endpoint.subscriptions",
-      "defaultValue": "/subscriptions",
-      "type": "java.lang.String"
-    },
-    {
-      "name": "playground.cdn.enabled",
-      "defaultValue": false,
-      "type": "java.lang.Boolean"
-    },
-    {
-      "name": "playground.cdn.version",
-      "defaultValue": "latest",
-      "type": "java.lang.String"
-    },
-    {
-      "name": "playground.pageTitle",
-      "defaultValue": "Playground",
-      "type": "java.lang.String"
     }
   ]
 }