Polish Actuator hypermedia support

spring-boot-samples/spring-boot-sample-hypermedia/pom.xml

@@ -2,24 +2,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>spring-boot-sample-hypermedia</artifactId>
-	<packaging>jar</packaging>
-
-	<name>spring-boot-sample-hypermedia</name>
-	<description>Demo project for Spring Boot</description>
-
 	<parent>
+		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
 		<version>1.3.0.BUILD-SNAPSHOT</version>
 	</parent>
-
+	<artifactId>spring-boot-sample-hypermedia</artifactId>
+	<name>Spring Boot Hypermedia Sample</name>
+	<description>Spring Boot Hypermedia Sample</description>
 	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.7</java.version>
 	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -41,18 +37,12 @@
 			<groupId>org.webjars</groupId>
 			<artifactId>hal-browser</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -61,5 +51,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
 </project>

spring-boot-samples/spring-boot-sample-hypermedia/src/main/java/demo/SpringBootHypermediaApplication.java

@@ -1,12 +0,0 @@
-package demo;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class SpringBootHypermediaApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(SpringBootHypermediaApplication.class, args);
-	}
-}

spring-boot-samples/spring-boot-sample-hypermedia/src/main/java/sample/hypermedia/SampleHypermediaApplication.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2012-2015 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 sample.hypermedia;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SampleHypermediaApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(SampleHypermediaApplication.class, args);
+	}
+
+}

spring-boot-samples/spring-boot-sample-hypermedia/src/test/java/demo/SpringBootHypermediaApplicationTests.java

@@ -1,18 +0,0 @@
-package demo;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = SpringBootHypermediaApplication.class)
-@WebAppConfiguration
-public class SpringBootHypermediaApplicationTests {
-
-	@Test
-	public void contextLoads() {
-	}
-
-}

spring-boot-samples/spring-boot-sample-hypermedia/src/test/java/sample/hypermedia/SampleHypermediaApplicationHomePageTests.java

@@ -1,6 +1,20 @@
-package demo;
+/*
+ * Copyright 2012-2015 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.
+ */
 
-import static org.junit.Assert.assertTrue;
+package sample.hypermedia;
 
 import java.net.URI;
 import java.util.Arrays;
@@ -19,19 +33,21 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
+import static org.junit.Assert.assertTrue;
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = SpringBootHypermediaApplication.class)
+@SpringApplicationConfiguration(classes = SampleHypermediaApplication.class)
 @WebAppConfiguration
 @IntegrationTest("server.port=0")
-public class HomePageHypermediaApplicationTests {
+public class SampleHypermediaApplicationHomePageTests {
 
 	@Value("${local.server.port}")
 	private int port;
 
 	@Test
 	public void home() {
-		String response = new TestRestTemplate().getForObject("http://localhost:" + port,
-				String.class);
+		String response = new TestRestTemplate().getForObject("http://localhost:"
+				+ this.port, String.class);
 		assertTrue("Wrong body: " + response, response.contains("\"_links\":"));
 		assertTrue("Wrong body: " + response, response.contains("\"curies\":"));
 	}
@@ -41,8 +57,8 @@ public class HomePageHypermediaApplicationTests {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
 		ResponseEntity<String> response = new TestRestTemplate().exchange(
-				new RequestEntity<Void>(headers , HttpMethod.GET, new URI("http://localhost:"
-						+ port + "/")), String.class);
+				new RequestEntity<Void>(headers, HttpMethod.GET, new URI(
+						"http://localhost:" + this.port + "/")), String.class);
 		assertTrue("Wrong body: " + response, response.getBody().contains("\"_links\":"));
 	}
 
@@ -51,8 +67,8 @@ public class HomePageHypermediaApplicationTests {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
 		ResponseEntity<String> response = new TestRestTemplate().exchange(
-				new RequestEntity<Void>(headers , HttpMethod.GET, new URI("http://localhost:"
-						+ port)), String.class);
+				new RequestEntity<Void>(headers, HttpMethod.GET, new URI(
+						"http://localhost:" + this.port)), String.class);
 		assertTrue("Wrong body: " + response, response.getBody().contains("HAL Browser"));
 	}