iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fix

This commit is contained in:
DOHA 2016-01-29 17:44:11 +02:00
parent 377c71e9d7
commit 89651d72f7
15 changed files with 15 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-zuul/pom.xml
View File

@ -15,7 +15,6 @@
<modules>
<module>spring-zuul-foos-resource</module>
<module>spring-zuul-users-resource</module>
<module>spring-zuul-ui</module>
</modules>

10
spring-zuul/spring-zuul-foos-resource/.project
View File

@ -20,11 +20,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.springframework.ide.eclipse.core.springbuilder</name>
<arguments>
@ -35,6 +30,11 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

10
spring-zuul/spring-zuul-ui/.classpath
View File

@ -17,6 +17,11 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
@ -28,10 +33,5 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

10
spring-zuul/spring-zuul-ui/.project
View File

@ -20,6 +20,11 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.springframework.ide.eclipse.core.springbuilder</name>
<arguments>
@ -30,11 +35,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

4
spring-zuul/spring-zuul-ui/src/main/resources/application.yml
View File

@ -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

32
spring-zuul/spring-zuul-ui/src/main/resources/templates/index.html
View File

@ -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});
}
});
/*]]>*/
</script>
@ -63,27 +52,6 @@ app.controller('mainCtrl', function($scope,$resource,$http) {
<div class="col-sm-12">
<a class="btn btn-default" href="#" ng-click="getFoo()">New Foo</a>
</div>
<br/><br/>
<h1 class="col-sm-12">User Details</h1>
<div class="col-sm-12">
<label class="col-sm-3">ID</label>
<span>{{user.id}}</span>
</div>
<div class="col-sm-12">
<label class="col-sm-3">Username</label>
<span>{{user.username}}</span>
</div>
<div class="col-sm-12">
<label class="col-sm-3">Age</label>
<span>{{user.age}}</span>
</div>
<div class="col-sm-12">
<a class="btn btn-default" href="#" ng-click="getUser()">New User</a>
</div>
</div>
</body>

6
spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java
View File

@ -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");

32
spring-zuul/spring-zuul-users-resource/.classpath
View File

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

48
spring-zuul/spring-zuul-users-resource/.project
View File

@ -1,48 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>spring-zuul-users-resource</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.springframework.ide.eclipse.core.springbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>

38
spring-zuul/spring-zuul-users-resource/pom.xml
View File

@ -1,38 +0,0 @@
<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-zuul-users-resource</artifactId>
<name>spring-zuul-users-resource</name>
<packaging>war</packaging>
<parent>
<groupId>org.baeldung</groupId>
<artifactId>spring-zuul</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
</dependencies>
<build>
<finalName>spring-zuul-users-resource</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</project>

14
spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java
View File

@ -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);
}
}

13
spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java
View File

@ -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 {
}

30
spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/web/controller/UserController.java
View File

@ -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)));
}
}

46
spring-zuul/spring-zuul-users-resource/src/main/java/org/baeldung/web/dto/User.java
View File

@ -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;
}
}

2
spring-zuul/spring-zuul-users-resource/src/main/resources/application.properties
View File

@ -1,2 +0,0 @@
server.contextPath=/spring-zuul-users-resource
server.port=8081