From 89651d72f7275ae61ca2642ebd0278c591925539 Mon Sep 17 00:00:00 2001 From: DOHA Date: Fri, 29 Jan 2016 17:44:11 +0200 Subject: [PATCH] minor fix --- spring-zuul/pom.xml | 1 - .../spring-zuul-foos-resource/.project | 10 ++-- spring-zuul/spring-zuul-ui/.classpath | 10 ++-- spring-zuul/spring-zuul-ui/.project | 10 ++-- .../src/main/resources/application.yml | 4 -- .../src/main/resources/templates/index.html | 32 ------------- .../test/java/org/baeldung/web/LiveTest.java | 6 --- .../spring-zuul-users-resource/.classpath | 32 ------------- .../spring-zuul-users-resource/.project | 48 ------------------- .../spring-zuul-users-resource/pom.xml | 38 --------------- .../config/ResourceServerApplication.java | 14 ------ .../config/ResourceServerWebConfig.java | 13 ----- .../web/controller/UserController.java | 30 ------------ .../main/java/org/baeldung/web/dto/User.java | 46 ------------------ .../src/main/resources/application.properties | 2 - 15 files changed, 15 insertions(+), 281 deletions(-) delete mode 100644 spring-zuul/spring-zuul-users-resource/.classpath delete mode 100644 spring-zuul/spring-zuul-users-resource/.project delete mode 100644 spring-zuul/spring-zuul-users-resource/pom.xml delete mode 100644 spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java delete mode 100644 spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java delete mode 100644 spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/web/controller/UserController.java delete mode 100644 spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/web/dto/User.java delete mode 100644 spring-zuul/spring-zuul-users-resource/src/main/resources/application.properties diff --git a/spring-zuul/pom.xml b/spring-zuul/pom.xml index 57ad3dfd30..6ad1d0be34 100644 --- a/spring-zuul/pom.xml +++ b/spring-zuul/pom.xml @@ -15,7 +15,6 @@ spring-zuul-foos-resource - spring-zuul-users-resource spring-zuul-ui diff --git a/spring-zuul/spring-zuul-foos-resource/.project b/spring-zuul/spring-zuul-foos-resource/.project index de3fc55423..8d04c873fb 100644 --- a/spring-zuul/spring-zuul-foos-resource/.project +++ b/spring-zuul/spring-zuul-foos-resource/.project @@ -20,11 +20,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.springframework.ide.eclipse.core.springbuilder @@ -35,6 +30,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.jem.workbench.JavaEMFNature diff --git a/spring-zuul/spring-zuul-ui/.classpath b/spring-zuul/spring-zuul-ui/.classpath index 1e75b7bbbb..5c3ac53820 100644 --- a/spring-zuul/spring-zuul-ui/.classpath +++ b/spring-zuul/spring-zuul-ui/.classpath @@ -17,6 +17,11 @@ + + + + + @@ -28,10 +33,5 @@ - - - - - diff --git a/spring-zuul/spring-zuul-ui/.project b/spring-zuul/spring-zuul-ui/.project index d87aec6bec..ec0f2cde81 100644 --- a/spring-zuul/spring-zuul-ui/.project +++ b/spring-zuul/spring-zuul-ui/.project @@ -20,6 +20,11 @@ + + org.eclipse.m2e.core.maven2Builder + + + org.springframework.ide.eclipse.core.springbuilder @@ -30,11 +35,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.jem.workbench.JavaEMFNature diff --git a/spring-zuul/spring-zuul-ui/src/main/resources/application.yml b/spring-zuul/spring-zuul-ui/src/main/resources/application.yml index 14660c497b..855020a40e 100644 --- a/spring-zuul/spring-zuul-ui/src/main/resources/application.yml +++ b/spring-zuul/spring-zuul-ui/src/main/resources/application.yml @@ -3,7 +3,3 @@ zuul: foos: path: /foos/** url: http://localhost:8081/spring-zuul-foos-resource/foos - users: - path: /users/** - url: http://localhost:8081/spring-zuul-users-resource/users - \ No newline at end of file diff --git a/spring-zuul/spring-zuul-ui/src/main/resources/templates/index.html b/spring-zuul/spring-zuul-ui/src/main/resources/templates/index.html index 07d2b77f7f..d279f9eaf9 100755 --- a/spring-zuul/spring-zuul-ui/src/main/resources/templates/index.html +++ b/spring-zuul/spring-zuul-ui/src/main/resources/templates/index.html @@ -33,17 +33,6 @@ app.controller('mainCtrl', function($scope,$resource,$http) { $scope.foo = $scope.foos.get({fooId:$scope.foo.id}); } - $scope.user = {id:0 , username:"john", age:11}; - $scope.users = $resource("/users/:userId",{userId:'@id'}); - - $scope.getUser = function(){ - $scope.user = $scope.users.get({userId:$scope.user.id}); - } - - - - - }); /*]]>*/ @@ -63,27 +52,6 @@ app.controller('mainCtrl', function($scope,$resource,$http) {
New Foo
-

- -

User Details

-
- - {{user.id}} -
- -
- - {{user.username}} -
- -
- - {{user.age}} -
- -
- New User -
diff --git a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java b/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java index 094d3250c7..7ced527778 100644 --- a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java +++ b/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java @@ -15,12 +15,6 @@ public class LiveTest { assertEquals(200, response.getStatusCode()); } - @Test - public void whenSendRequestToUserResource_thenHeaderAdded() { - final Response response = RestAssured.get("http://localhost:8080/users/1"); - assertEquals(200, response.getStatusCode()); - } - @Test public void whenSendRequest_thenHeaderAdded() { final Response response = RestAssured.get("http://localhost:8080/foos/1"); diff --git a/spring-zuul/spring-zuul-users-resource/.classpath b/spring-zuul/spring-zuul-users-resource/.classpath deleted file mode 100644 index 0cad5db2d0..0000000000 --- a/spring-zuul/spring-zuul-users-resource/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-zuul/spring-zuul-users-resource/.project b/spring-zuul/spring-zuul-users-resource/.project deleted file mode 100644 index 2fedf43db4..0000000000 --- a/spring-zuul/spring-zuul-users-resource/.project +++ /dev/null @@ -1,48 +0,0 @@ - - - spring-zuul-users-resource - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - org.springframework.ide.eclipse.core.springbuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.springframework.ide.eclipse.core.springnature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/spring-zuul/spring-zuul-users-resource/pom.xml b/spring-zuul/spring-zuul-users-resource/pom.xml deleted file mode 100644 index 653c6b9d15..0000000000 --- a/spring-zuul/spring-zuul-users-resource/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - 4.0.0 - spring-zuul-users-resource - spring-zuul-users-resource - war - - - org.baeldung - spring-zuul - 1.0.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - - - - spring-zuul-users-resource - - - src/main/resources - true - - - - - \ No newline at end of file diff --git a/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java b/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java deleted file mode 100644 index 1e35eff551..0000000000 --- a/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.baeldung.config; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.web.SpringBootServletInitializer; - -@SpringBootApplication -public class ResourceServerApplication extends SpringBootServletInitializer { - - public static void main(String[] args) { - SpringApplication.run(ResourceServerApplication.class, args); - } - -} \ No newline at end of file diff --git a/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java b/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java deleted file mode 100644 index c040c8ac42..0000000000 --- a/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.baeldung.config; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; - -@Configuration -@EnableWebMvc -@ComponentScan({ "org.baeldung.web.controller" }) -public class ResourceServerWebConfig extends WebMvcConfigurerAdapter { - -} diff --git a/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/web/controller/UserController.java b/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/web/controller/UserController.java deleted file mode 100644 index b1db89179a..0000000000 --- a/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/web/controller/UserController.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.baeldung.web.controller; - -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; -import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.baeldung.web.dto.User; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; - -@Controller -public class UserController { - - public UserController() { - super(); - } - - // API - read - @RequestMapping(method = RequestMethod.GET, value = "/users/{id}") - @ResponseBody - public User findById(@PathVariable final long id, HttpServletRequest req, HttpServletResponse res) { - return new User(Long.parseLong(randomNumeric(2)), randomAlphabetic(4), Integer.parseInt(randomNumeric(2))); - } - -} diff --git a/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/web/dto/User.java b/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/web/dto/User.java deleted file mode 100644 index f5e4124f93..0000000000 --- a/spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/web/dto/User.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.baeldung.web.dto; - -public class User { - private long id; - private String username; - private int age; - - public User() { - super(); - } - - public User(final long id, final String name, int age) { - super(); - - this.id = id; - this.username = name; - this.age = age; - } - - // - - public long getId() { - return id; - } - - public void setId(final long id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(final String username) { - this.username = username; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } - -} \ No newline at end of file diff --git a/spring-zuul/spring-zuul-users-resource/src/main/resources/application.properties b/spring-zuul/spring-zuul-users-resource/src/main/resources/application.properties deleted file mode 100644 index 81284546ce..0000000000 --- a/spring-zuul/spring-zuul-users-resource/src/main/resources/application.properties +++ /dev/null @@ -1,2 +0,0 @@ -server.contextPath=/spring-zuul-users-resource -server.port=8081 \ No newline at end of file