Merge pull request #173 from paulben/paulben1

Change Spring comments from MVC to REST

Author: katheris

README.md

@@ -21,14 +21,14 @@ Inside the project there is a application.servlet package containing the <code>L
 
 For the complete feature documentation, see the [servlet-3.1](http://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/rwlp_feature_servlet-3.1.html) feature description in IBM Knowledge Center.
 
-## Spring Boot with Spring MVC
+## Spring Boot with Spring REST
 This provides you with a SpringBoot application that will run on WebSphere Liberty.
 
 Inside the project there is a application.springboot.web package containing two classes:
 * SpringBootLibertyApplication</code>: The entry point for the SpringBoot application.
-* LibertyHelloController</code>: A Spring MVC endpoint which you can access at /springbootweb.
+* LibertyHelloController</code>: A Spring REST endpoint which you can access at /springbootweb.
 
-There is also a test class named <code>it.springboot.web.HelloControllerTest</code> that will test the Spring MVC endpoint to ensure it is working.
+There is also a test class named <code>it.springboot.web.HelloControllerTest</code> that will test the Spring REST endpoint to ensure it is working.
 
 ## Websockets
 This provides you with the websocket-1.1 feature.

starter-microservice-springboot-web/src/main/webapp/WEB-INF/classes/description.html

@@ -14,12 +14,12 @@
   limitations under the License.
 -->
 <div>
-	<h2>Spring Boot with Spring MVC</h2>
+	<h2>Spring Boot with Spring REST</h2>
 	<p>Inside the project there is a application.springboot.web package
 		containing two classes:</p>
 	<ul>
 		<li><code>SpringBootLibertyApplication</code>: The entry point for the SpringBoot application.</li>
-		<li><code>LibertyHelloController</code>: A Spring MVC endpoint which you can access at <a href="springbootweb">/springbootweb</a></li>
+		<li><code>LibertyHelloController</code>: A Spring REST endpoint which you can access at <a href="springbootweb">/springbootweb</a></li>
 	</ul>
-	<p>There is also a test class named <code>it.springboot.web.HelloControllerTest</code> that will test the Spring MVC endpoint to ensure it is working.</p>
+	<p>There is also a test class named <code>it.springboot.web.HelloControllerTest</code> that will test the Spring REST endpoint to ensure it is working.</p>
 </div>

starter-microservice-springboot-web/src/main/webapp/sample/src/main/java/application/springboot/web/LibertyHelloController.java

@@ -23,7 +23,7 @@ public class LibertyHelloController {
 
     @RequestMapping("/springbootweb")
     public String hello() {
-        return "Hello from Spring Boot MVC running on Liberty!";
+        return "Hello from Spring Boot REST running on Liberty!";
     }
 
-}
+}

starter-microservice-springboot-web/src/main/webapp/sample/src/test/java/it/springboot/web/HelloControllerTest.java

@@ -24,6 +24,6 @@ public class HelloControllerTest extends EndpointTest {
 
     @Test
     public void testDeployment() {
-        testEndpoint("/springbootweb", "Hello from Spring Boot MVC running on Liberty!");
+        testEndpoint("/springbootweb", "Hello from Spring Boot REST running on Liberty!");
     }
-}
+}

starter-microservice-springboot-web/src/test/java/com/ibm/liberty/starter/service/springboot/api/v1/it/TestApplication.java

@@ -40,7 +40,7 @@ public void checkSetup() {
     public void testProvider() throws Exception {
         Provider provider =  testEndpoint("/api/v1/provider/", Provider.class);
         assertNotNull("No response from API for provider", provider);
-        assertTrue("Description was not found.", provider.getDescription().contains("<h2>Spring Boot with Spring MVC</h2>"));
+        assertTrue("Description was not found.", provider.getDescription().contains("<h2>Spring Boot with Spring REST</h2>"));
         Dependency[] dependencies = provider.getDependencies();
         boolean providedDependency = false;
         boolean runtimeDependency = false;