feat/refactor(#212): modified cdn config structure; package restructured

Author: BlasiusSecundus

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

@@ -32,7 +32,7 @@ public class PlaygroundController {
 
     @GetMapping("${graphql.playground.mapping:/playground}")
     public String playground(final Model model) {
-        if (propertiesConfiguration.getPlayground().isCdnEnabled()) {
+        if (propertiesConfiguration.getPlayground().getCdn().isEnabled()) {
             setCdnUrls(model);
         } else {
             setLocalAssetUrls(model);
@@ -43,7 +43,8 @@ public String playground(final Model model) {
     }
 
     private String getCdnUrl(final String assetUrl) {
-        return String.format("%s@%s/%s", CDN_ROOT, propertiesConfiguration.getPlayground().getCdnVersion(), assetUrl);
+        return String.format("%s@%s/%s", CDN_ROOT, propertiesConfiguration.getPlayground().getCdn().getVersion(),
+                assetUrl);
     }
 
     private void setCdnUrls(final Model model) {

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

@@ -1,5 +1,6 @@
 package com.oembedler.moon.playground.boot;
 
+import com.oembedler.moon.playground.boot.properties.PlaygroundProperties;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.validation.annotation.Validated;

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

@@ -0,0 +1,13 @@
+package com.oembedler.moon.playground.boot.properties;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Data
+public class PlaygroundCdn {
+
+    private boolean enabled;
+    @NotEmpty
+    private String version = "latest";
+}

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

@@ -1,11 +1,11 @@
-package com.oembedler.moon.playground.boot;
+package com.oembedler.moon.playground.boot.properties;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.oembedler.moon.playground.boot.settings.PlaygroundSettings;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import java.util.Collections;
 import java.util.List;
 
 @Data
@@ -19,16 +19,12 @@ public class PlaygroundProperties {
     private String subscriptionEndpoint = "/subscriptions";
 
     @JsonIgnore
-    private boolean cdnEnabled;
-
-    @NotEmpty
-    @JsonIgnore
-    private String cdnVersion = "latest";
+    private PlaygroundCdn cdn = new PlaygroundCdn();
 
     @JsonIgnore
     private String pageTitle = "Playground";
 
     private PlaygroundSettings settings;
 
-    private List<PlaygroundTab> tabs;
+    private List<PlaygroundTab> tabs = Collections.emptyList();
 }

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

@@ -1,7 +1,12 @@
-package com.oembedler.moon.playground.boot.settings;
+package com.oembedler.moon.playground.boot.properties;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import com.oembedler.moon.playground.boot.properties.settings.PlaygroundEditorSettings;
+import com.oembedler.moon.playground.boot.properties.settings.PlaygroundPrettierSettings;
+import com.oembedler.moon.playground.boot.properties.settings.PlaygroundRequestSettings;
+import com.oembedler.moon.playground.boot.properties.settings.PlaygroundSchemaSettings;
+import com.oembedler.moon.playground.boot.properties.settings.PlaygroundTracingSettings;
 import lombok.Data;
 
 @Data

playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/PlaygroundTab.java renamed to playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/properties/PlaygroundTab.java

@@ -1,6 +1,7 @@
-package com.oembedler.moon.playground.boot;
+package com.oembedler.moon.playground.boot.properties;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.oembedler.moon.playground.boot.ResourceSerializer;
 import lombok.Data;
 import org.springframework.core.io.Resource;
 

playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/settings/PlaygroundEditorCursorShape.java renamed to playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/properties/settings/PlaygroundEditorCursorShape.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.playground.boot.settings;
+package com.oembedler.moon.playground.boot.properties.settings;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/settings/PlaygroundEditorSettings.java renamed to playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/properties/settings/PlaygroundEditorSettings.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.playground.boot.settings;
+package com.oembedler.moon.playground.boot.properties.settings;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;

playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/settings/PlaygroundEditorTheme.java renamed to playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/properties/settings/PlaygroundEditorTheme.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.playground.boot.settings;
+package com.oembedler.moon.playground.boot.properties.settings;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/settings/PlaygroundPrettierSettings.java renamed to playground-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/playground/boot/properties/settings/PlaygroundPrettierSettings.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.playground.boot.settings;
+package com.oembedler.moon.playground.boot.properties.settings;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;