From 8efe5f34bec115933694d2f5414cd0d7df90446f Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 18 Sep 2017 15:02:01 +0200
Subject: [PATCH] Ensure configuration can be serialized

Closes gh-506
---
 .../initializr/metadata/Dependency.java       |  1 +
 .../initializr/util/VersionProperty.java      |  3 +
 .../resources/application-test-default.yml    |  1 +
 .../service/InitializrServiceSmokeTests.java  | 86 +++++++++++++++++++
 .../metadata/config/test-default.json         |  1 +
 5 files changed, 92 insertions(+)
 create mode 100644 initializr-service/src/test/java/io/spring/initializr/service/InitializrServiceSmokeTests.java

diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java
index c6428560..a454838c 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java
@@ -425,6 +425,7 @@ public class Dependency extends MetadataElement implements Describable {
 		 */
 		private String version;
 
+		@JsonIgnore
 		private VersionRange range;
 
 		public String getGroupId() {
diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/VersionProperty.java b/initializr-generator/src/main/java/io/spring/initializr/util/VersionProperty.java
index f01480fa..7a5eb554 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/util/VersionProperty.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/util/VersionProperty.java
@@ -20,6 +20,8 @@ import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonValue;
+
 import org.springframework.util.StringUtils;
 
 /**
@@ -55,6 +57,7 @@ public class VersionProperty implements Serializable, Comparable<VersionProperty
 		return sb.toString();
 	}
 
+	@JsonValue
 	public String toStandardFormat() {
 		return this.property;
 	}
diff --git a/initializr-generator/src/test/resources/application-test-default.yml b/initializr-generator/src/test/resources/application-test-default.yml
index dae8c3e0..20f0d9fa 100644
--- a/initializr-generator/src/test/resources/application-test-default.yml
+++ b/initializr-generator/src/test/resources/application-test-default.yml
@@ -8,6 +8,7 @@ initializr:
       my-api-bom:
         groupId: org.acme
         artifactId: my-api-bom
+        versionProperty: my-api.version
         additionalBoms: ['my-api-dependencies-bom']
         mappings:
           - versionRange: "[1.0.0.RELEASE,1.1.6.RELEASE)"
diff --git a/initializr-service/src/test/java/io/spring/initializr/service/InitializrServiceSmokeTests.java b/initializr-service/src/test/java/io/spring/initializr/service/InitializrServiceSmokeTests.java
new file mode 100644
index 00000000..0ae9e4c7
--- /dev/null
+++ b/initializr-service/src/test/java/io/spring/initializr/service/InitializrServiceSmokeTests.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2012-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.spring.initializr.service;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import io.spring.initializr.metadata.InitializrMetadata;
+import io.spring.initializr.metadata.InitializrMetadataBuilder;
+import io.spring.initializr.metadata.InitializrMetadataProvider;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Basic smoke tests for {@link InitializrService}.
+ *
+ * @author Stephane Nicoll
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+public class InitializrServiceSmokeTests {
+
+	@Autowired
+	private TestRestTemplate restTemplate;
+
+	@Autowired
+	private InitializrMetadataProvider metadataProvider;
+
+	@Test
+	public void metadataCanBeSerialized() throws URISyntaxException {
+		RequestEntity<Void> request = RequestEntity.get(new URI("/"))
+				.accept(MediaType.parseMediaType("application/vnd.initializr.v2.1+json"))
+				.build();
+		ResponseEntity<String> response = this.restTemplate.exchange(request, String.class);
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		new JSONObject(response.getBody());
+	}
+
+	@Test
+	public void configurationCanBeSerialized() throws URISyntaxException {
+		RequestEntity<Void> request = RequestEntity.get(new URI("/metadata/config"))
+				.accept(MediaType.APPLICATION_JSON)
+				.build();
+		ResponseEntity<String> response = this.restTemplate.exchange(request, String.class);
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+		InitializrMetadata actual = InitializrMetadataBuilder.create()
+				.withInitializrMetadata(new ByteArrayResource(
+						response.getBody().getBytes()))
+				.build();
+		assertThat(actual).isNotNull();
+		InitializrMetadata expected = metadataProvider.get();
+		assertThat(actual.getDependencies().getAll().size())
+				.isEqualTo(expected.getDependencies().getAll().size());
+		assertThat(actual.getConfiguration().getEnv().getBoms().size())
+				.isEqualTo(expected.getConfiguration().getEnv().getBoms().size());
+	}
+
+}
diff --git a/initializr-web/src/test/resources/metadata/config/test-default.json b/initializr-web/src/test/resources/metadata/config/test-default.json
index bc9e0d82..75dc1db4 100644
--- a/initializr-web/src/test/resources/metadata/config/test-default.json
+++ b/initializr-web/src/test/resources/metadata/config/test-default.json
@@ -86,6 +86,7 @@
       "my-api-bom": {
         "groupId": "org.acme",
         "artifactId": "my-api-bom",
+        "versionProperty": "my-api.version",
         "additionalBoms": [
           "my-api-dependencies-bom"
         ],