Move all packages to new graphql.kickstart package

Author: oliemansm

altair-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/altair/boot/AltairAutoConfiguration.java renamed to altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/AltairAutoConfiguration.java

@@ -1,8 +1,9 @@
-package com.oembedler.moon.altair.boot;
+package graphql.kickstart.altair.boot;
 
         import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
         import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
         import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+        import org.springframework.boot.context.properties.EnableConfigurationProperties;
         import org.springframework.context.annotation.Bean;
         import org.springframework.context.annotation.Configuration;
         import org.springframework.web.servlet.DispatcherServlet;
@@ -12,6 +13,7 @@
  */
 @Configuration
 @ConditionalOnWebApplication
+@EnableConfigurationProperties(AltairProperties.class)
 @ConditionalOnClass(DispatcherServlet.class)
 public class AltairAutoConfiguration {
     @Bean

altair-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/altair/boot/AltairController.java renamed to altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/AltairController.java

@@ -1,11 +1,19 @@
-package com.oembedler.moon.altair.boot;
+package graphql.kickstart.altair.boot;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.text.StrSubstitutor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.MediaType;
@@ -15,16 +23,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
 /**
  * @author Moncef AOUDIA
  */
@@ -34,23 +32,8 @@ public class AltairController {
     private static final String CDN_UNPKG = "//unpkg.com/";
     private static final String ALTAIR = "altair-static";
 
-    @Value("${altair.endpoint.graphql:/graphql}")
-    private String graphqlEndpoint;
-
-    @Value("${altair.endpoint.subscriptions:/subscriptions}")
-    private String subscriptionsEndpoint;
-
-    @Value("${altair.static.basePath:}")
-    private String staticBasePath;
-
-    @Value("${altair.pageTitle:Altair}")
-    private String pageTitle;
-
-    @Value("${altair.cdn.enabled:false}")
-    private Boolean altairCdnEnabled;
-
-    @Value("${altair.cdn.version:2.1.7}")
-    private String altairCdnVersion;
+    @Autowired
+    private AltairProperties altairProperties;
 
     @Autowired
     private Environment environment;
@@ -97,7 +80,7 @@ public void altair(HttpServletRequest request, HttpServletResponse response, @Pa
 
         Map<String, String> replacements = getReplacements(
                 constructGraphQlEndpoint(request, params),
-                request.getContextPath() + subscriptionsEndpoint
+                request.getContextPath() + altairProperties.getEndpoint().getSubscriptions()
         );
 
         String populatedTemplate = StrSubstitutor.replace(template, replacements);
@@ -108,10 +91,10 @@ private Map<String, String> getReplacements(String graphqlEndpoint, String subsc
         Map<String, String> replacements = new HashMap<>();
         replacements.put("graphqlEndpoint", graphqlEndpoint);
         replacements.put("subscriptionsEndpoint", subscriptionsEndpoint);
-        replacements.put("pageTitle", pageTitle);
+        replacements.put("pageTitle", altairProperties.getPageTitle());
         replacements.put("pageFavicon", getResourceUrl("favicon.ico", "favicon.ico"));
-        replacements.put("altairBaseUrl", getResourceUrl(StringUtils.join(staticBasePath, "/vendor/altair/"),
-                joinJsUnpkgPath(ALTAIR, altairCdnVersion, "build/dist/")));
+        replacements.put("altairBaseUrl", getResourceUrl(StringUtils.join(altairProperties.getSTATIC().getBasePath(), "/vendor/altair/"),
+                joinJsUnpkgPath(ALTAIR, altairProperties.getCdn().getVersion(), "build/dist/")));
         replacements.put("altairLogoUrl", getResourceUrl("assets/img/logo_350.svg", "assets/img/logo_350.svg"));
         replacements.put("altairCssUrl", getResourceUrl("styles.css", "styles.css"));
         replacements.put("altairMainJsUrl", getResourceUrl("main.js", "main.js"));
@@ -123,7 +106,7 @@ private Map<String, String> getReplacements(String graphqlEndpoint, String subsc
     }
 
     private String getResourceUrl(String staticFileName, String cdnUrl) {
-        if (altairCdnEnabled && StringUtils.isNotBlank(cdnUrl)) {
+        if (altairProperties.getCdn().isEnabled() && StringUtils.isNotBlank(cdnUrl)) {
             return cdnUrl;
         }
         return staticFileName;
@@ -134,7 +117,7 @@ private String joinJsUnpkgPath(String library, String cdnVersion, String cdnFile
     }
 
     private String constructGraphQlEndpoint(HttpServletRequest request, @RequestParam Map<String, String> params) {
-        String endpoint = graphqlEndpoint;
+        String endpoint = altairProperties.getEndpoint().getGraphql();
         for (Map.Entry<String, String> param : params.entrySet()) {
             endpoint = endpoint.replaceAll("\\{" + param.getKey() + "}", param.getValue());
         }

altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/AltairProperties.java

@@ -0,0 +1,34 @@
+package graphql.kickstart.altair.boot;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Data
+@ConfigurationProperties("altair")
+public class AltairProperties {
+
+  private boolean enabled = true;
+  private Endpoint endpoint = new Endpoint();
+  private Static STATIC = new Static();
+  private Cdn cdn = new Cdn();
+  private String pageTitle = "Altair";
+  private String mapping = "/altair";
+
+  @Data
+  static class Endpoint {
+    private String graphql = "/graphql";
+    private String subscriptions = "/subscriptions";
+  }
+
+  @Data
+  static class Static {
+    private String basePath = "/";
+  }
+
+  @Data
+  static class Cdn {
+    private boolean enabled = false;
+    private String version = "2.1.7";
+  }
+
+}

altair-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/altair/boot/PropertyGroupReader.java renamed to altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/PropertyGroupReader.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.altair.boot;
+package graphql.kickstart.altair.boot;
 
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;

altair-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/altair/boot/PropsLoader.java renamed to altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/PropsLoader.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.altair.boot;
+package graphql.kickstart.altair.boot;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.core.env.Environment;

altair-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -1 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.oembedler.moon.altair.boot.AltairAutoConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=graphql.kickstart.altair.boot.AltairAutoConfiguration

altair-spring-boot-autoconfigure/src/test/java/com/oembedler/moon/altair/boot/test/AbstractAutoConfigurationTest.java renamed to altair-spring-boot-autoconfigure/src/test/java/graphql/kickstart/altair/boot/test/AbstractAutoConfigurationTest.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.altair.boot.test;
+package graphql.kickstart.altair.boot.test;
 
 import org.junit.After;
 import org.springframework.boot.test.util.TestPropertyValues;

altair-spring-boot-autoconfigure/src/test/java/com/oembedler/moon/altair/boot/test/AltairControllerTest.java renamed to altair-spring-boot-autoconfigure/src/test/java/graphql/kickstart/altair/boot/test/AltairControllerTest.java

@@ -1,7 +1,7 @@
-package com.oembedler.moon.altair.boot.test;
+package graphql.kickstart.altair.boot.test;
 
-import com.oembedler.moon.altair.boot.AltairAutoConfiguration;
-import com.oembedler.moon.altair.boot.AltairController;
+import graphql.kickstart.altair.boot.AltairAutoConfiguration;
+import graphql.kickstart.altair.boot.AltairController;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -51,4 +51,4 @@ public void altairDoesNotLoad() {
 
         this.getContext().getBean(AltairController.class);
     }
-}
+}

example-graphql-subscription/src/main/java/com/oembedler/moon/graphql/boot/SubscriptionSampleApplication.java renamed to example-graphql-subscription/src/main/java/graphql/kickstart/spring/web/boot/SubscriptionSampleApplication.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot;
+package graphql.kickstart.spring.web.boot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

example-graphql-subscription/src/main/java/com/oembedler/moon/graphql/boot/publishers/StockTickerReactorPublisher.java renamed to example-graphql-subscription/src/main/java/graphql/kickstart/spring/web/boot/publishers/StockTickerReactorPublisher.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.publishers;
+package graphql.kickstart.spring.web.boot.publishers;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -15,7 +15,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import com.oembedler.moon.graphql.boot.resolvers.StockPriceUpdate;
+import graphql.kickstart.spring.web.boot.resolvers.StockPriceUpdate;
 import reactor.core.publisher.ConnectableFlux;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
@@ -119,4 +119,4 @@ private static int rollDice(int min, int max) {
 		return rand.nextInt((max - min) + 1) + min;
 	}
 
-}
+}