Clean up code

Author: oliemansm

altair-spring-boot-autoconfigure/build.gradle

@@ -17,8 +17,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies{
+    implementation(project(':graphql-kickstart-starter-utils'))
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
-    
+
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.apache.commons:commons-text:$LIB_APACHE_COMMONS_TEXT"
     compileOnly "org.springframework.boot:spring-boot-starter-web"

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

@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import graphql.kickstart.util.PropertyGroupReader;
+import graphql.kickstart.util.PropsLoader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -55,11 +57,11 @@ private void loadTemplate() throws IOException {
   }
 
   private void loadProps() throws IOException {
-    props = new PropsLoader(environment).load();
+    props = new PropsLoader(environment, "altair.props.resources.", "altair.props.values.").load();
   }
 
   private void loadHeaders() throws JsonProcessingException {
-    PropertyGroupReader propertyReader = new PropertyGroupReader(environment, "graphiql.headers.");
+    PropertyGroupReader propertyReader = new PropertyGroupReader(environment, "altair.headers.");
     Properties headerProperties = propertyReader.load();
     this.headers = new ObjectMapper().writeValueAsString(headerProperties);
   }
@@ -86,7 +88,7 @@ private Map<String, String> getReplacements(String graphqlEndpoint,
     replacements.put("pageTitle", altairProperties.getPageTitle());
     replacements.put("pageFavicon", getResourceUrl("favicon.ico", "favicon.ico"));
     replacements.put("altairBaseUrl", getResourceUrl(
-        StringUtils.join(altairProperties.getSTATIC().getBasePath(), "/vendor/altair/"),
+        StringUtils.join(altairProperties.getBasePath(), "/vendor/altair/"),
         joinJsUnpkgPath(ALTAIR, altairProperties.getCdn().getVersion(), "build/dist/")));
     replacements
         .put("altairLogoUrl", getResourceUrl("assets/img/logo_350.svg", "assets/img/logo_350.svg"));

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

@@ -9,10 +9,10 @@ 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";
+  private String basePath = "";
 
   @Data
   static class Endpoint {
@@ -21,12 +21,6 @@ static class Endpoint {
     private String subscriptions = "/subscriptions";
   }
 
-  @Data
-  static class Static {
-
-    private String basePath = "";
-  }
-
   @Data
   static class Cdn {
 

example-graphql-subscription/src/main/java/graphql/kickstart/spring/web/boot/resolvers/Query.java

@@ -6,8 +6,10 @@
 @Component
 class Query implements GraphQLQueryResolver {
 
-  public String hello() {
-    return "Hello world!";
+  private static final String HELLO = "Hello world";
+
+  String hello() {
+    return HELLO;
   }
 
 }

graphiql-spring-boot-autoconfigure/build.gradle

@@ -17,6 +17,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies{
+    implementation(project(':graphql-kickstart-starter-utils'))
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 
     implementation "org.springframework.boot:spring-boot-autoconfigure"

graphiql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/graphiql/boot/GraphiQLController.java

@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import graphql.kickstart.util.PropertyGroupReader;
+import graphql.kickstart.util.PropsLoader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -53,7 +55,8 @@ private void loadTemplate() throws IOException {
   }
 
   private void loadProps() throws IOException {
-    props = new PropsLoader(environment).load();
+    props = new PropsLoader(environment, "graphiql.props.resources.", "graphiql.props.variables.")
+        .load();
   }
 
   private void loadHeaders() {
@@ -71,7 +74,7 @@ public byte[] graphiql(String contextPath, @PathVariable Map<String, String> par
     Map<String, String> replacements = getReplacements(
         constructGraphQlEndpoint(contextPath, params),
         contextPath + graphiQLProperties.getEndpoint().getSubscriptions(),
-        contextPath + graphiQLProperties.getSTATIC().getBasePath()
+        contextPath + graphiQLProperties.getBasePath()
     );
 
     String populatedTemplate = StringSubstitutor.replace(template, replacements);

graphiql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/graphiql/boot/GraphiQLProperties.java

@@ -8,13 +8,13 @@
 class GraphiQLProperties {
 
   private Endpoint endpoint = new Endpoint();
-  private Static STATIC = new Static();
   private CodeMirror codeMirror = new CodeMirror();
   private Props props = new Props();
   private String pageTitle = "GraphiQL";
   private String mapping = "/graphiql";
   private Subscriptions subscriptions = new Subscriptions();
   private Cdn cdn = new Cdn();
+  private String basePath = "/";
 
   @Data
   static class Endpoint {
@@ -23,12 +23,6 @@ static class Endpoint {
     private String subscriptions = "/subscriptions";
   }
 
-  @Data
-  static class Static {
-
-    private String basePath = "/";
-  }
-
   @Data
   static class CodeMirror {
 

graphiql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/graphiql/boot/PropertyGroupReader.java

@@ -9,11 +9,11 @@
 import org.springframework.context.ApplicationContextException;
 
 @DisplayName("Test exception if multiple query resolvers are defined.")
-public class GraphQLAnnotationsErrorMultipleQueryResolvers {
+class GraphQLAnnotationsErrorMultipleQueryResolversTest {
 
   @Test
   @DisplayName("Assert that MultipleQueryResolversException is thrown when multiple query resolvers are found.")
-  public void testMultipleQueryResolversExceptionIsThrown() {
+  void testMultipleQueryResolversExceptionIsThrown() {
     // GIVEN
     final SpringApplication app = new SpringApplication(TestApplication.class);
     app.setAdditionalProfiles("test", "test-multiple-query-resolvers-exception");

graphiql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/graphiql/boot/PropsLoader.java

@@ -9,11 +9,11 @@
 import org.springframework.context.ApplicationContextException;
 
 @DisplayName("Test exception if multiple subscription resolvers are defined.")
-public class GraphQLAnnotationsErrorMultipleSubscriptionResolvers {
+class GraphQLAnnotationsErrorMultipleSubscriptionResolversTest {
 
   @Test
   @DisplayName("Assert that MultipleSubscriptionResolversException is thrown when multiple subscription resolvers are found.")
-  public void testMultipleSubscriptionResolversExceptionIsThrown() {
+  void testMultipleSubscriptionResolversExceptionIsThrown() {
     // GIVEN
     final SpringApplication app = new SpringApplication(TestApplication.class);
     app.setAdditionalProfiles("test", "test-multiple-subscription-resolvers-exception");

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsErrorMultipleQueryResolvers.java renamed to graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsErrorMultipleQueryResolversTest.java

@@ -0,0 +1,3 @@
+dependencies {
+    compileOnly "org.springframework.boot:spring-boot-starter-web"
+}

graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsErrorMultipleSubscriptionResolvers.java renamed to graphql-kickstart-spring-boot-autoconfigure-graphql-annotations/src/test/java/graphql/kickstart/graphql/annotations/GraphQLAnnotationsErrorMultipleSubscriptionResolversTest.java

@@ -1,4 +1,4 @@
-package graphql.kickstart.altair.boot;
+package graphql.kickstart.util;
 
 import java.util.Arrays;
 import java.util.Iterator;
@@ -12,18 +12,18 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
 
-class PropertyGroupReader {
+public class PropertyGroupReader {
 
   private final Environment environment;
   private final String prefix;
   private Properties props;
 
-  PropertyGroupReader(Environment environment, String prefix) {
+  public PropertyGroupReader(Environment environment, String prefix) {
     this.environment = Objects.requireNonNull(environment);
     this.prefix = Optional.ofNullable(prefix).orElse("");
   }
 
-  Properties load() {
+  public Properties load() {
     if (props == null) {
       props = new Properties();
       loadProps();
@@ -46,7 +46,7 @@ private Stream<EnumerablePropertySource<Object>> streamOfPropertySources() {
       Iterable<PropertySource<?>> iterable = () -> iterator;
       return StreamSupport.stream(iterable.spliterator(), false)
           .filter(EnumerablePropertySource.class::isInstance)
-          .map(it -> (EnumerablePropertySource<Object>) it);
+          .map(EnumerablePropertySource.class::cast);
     }
     return Stream.empty();
   }

graphql-kickstart-starter-utils/build.gradle

@@ -1,4 +1,4 @@
-package graphql.kickstart.altair.boot;
+package graphql.kickstart.util;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
@@ -12,20 +12,20 @@
 import org.springframework.core.io.Resource;
 import org.springframework.util.StreamUtils;
 
-class PropsLoader {
-
-  private static final String ALTAIR_PROPS_PREFIX = "altair.props.";
-  private static final String ALTAIR_PROPS_RESOURCES_PREFIX = ALTAIR_PROPS_PREFIX + "resources.";
-  private static final String ALTAIR_PROPS_VALUES_PREFIX = ALTAIR_PROPS_PREFIX + "values.";
+public class PropsLoader {
 
   private final Environment environment;
+  private final String resourcesPrefix;
+  private final String valuesPrefix;
 
-  PropsLoader(Environment environment) {
+  public PropsLoader(Environment environment, String resourcesPrefix, String valuesPrefix) {
     this.environment = environment;
+    this.resourcesPrefix = resourcesPrefix;
+    this.valuesPrefix = valuesPrefix;
   }
 
-  String load() throws IOException {
-    PropertyGroupReader reader = new PropertyGroupReader(environment, ALTAIR_PROPS_VALUES_PREFIX);
+  public String load() throws IOException {
+    PropertyGroupReader reader = new PropertyGroupReader(environment, valuesPrefix);
     Properties props = reader.load();
 
     ObjectMapper objectMapper = new ObjectMapper();
@@ -36,7 +36,7 @@ String load() throws IOException {
   }
 
   private Optional<String> loadPropFromResource(String prop) {
-    String property = ALTAIR_PROPS_RESOURCES_PREFIX + prop;
+    String property = resourcesPrefix + prop;
     return Optional.ofNullable(environment.getProperty(property))
         .map(ClassPathResource::new)
         .map(this::loadResource);

altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/PropertyGroupReader.java renamed to graphql-kickstart-starter-utils/src/main/java/graphql/kickstart/util/PropertyGroupReader.java

@@ -13,7 +13,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 
-public class GraphQLFieldAssertAsJavaTypeTest extends GraphQLFieldAssertTestBase {
+class GraphQLFieldAssertAsJavaTypeTest extends GraphQLFieldAssertTestBase {
 
   private static final JavaType FOO_TYPE = TypeFactory.defaultInstance().constructType(Foo.class);
 

altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/PropsLoader.java renamed to graphql-kickstart-starter-utils/src/main/java/graphql/kickstart/util/PropsLoader.java

@@ -13,7 +13,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 
-public class GraphQLFieldAssertAsListTest extends GraphQLFieldAssertTestBase {
+class GraphQLFieldAssertAsListTest extends GraphQLFieldAssertTestBase {
 
   @Test
   @DisplayName("Should return a String list assertion (value at specific path is valid list).")