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

Merge branch 'task/BAEL-10944' of https://github.com/dkapil/tutorials into dkapil-task/BAEL-10944

This commit is contained in:
Loredana 2019-02-26 22:36:57 +02:00
parent 6bae0fc28a 4be7eaf419
commit 480aada52d
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -561,7 +561,7 @@
<module>reactor-core</module>
<module>rest-with-spark-java</module>
<module>resteasy</module>
<!-- <module>restx</module> --> <!-- Tests failing. Fixing in BAEL-10944 -->
<module>restx</module>
<!-- <module>rmi</module> --> <!-- Not a maven project -->
<module>rule-engines/easy-rules</module>
<module>rule-engines/openl-tablets</module>
@ -1279,7 +1279,7 @@
<module>reactor-core</module>
<module>rest-with-spark-java</module>
<module>resteasy</module>
<!-- <module>restx</module> --> <!-- Tests failing. Fixing in BAEL-10944 -->
<module>restx</module>
<!-- <module>rmi</module> --> <!-- Not a maven project -->
<module>rule-engines/easy-rules</module>
<module>rule-engines/openl-tablets</module>

2
restx/pom.xml
View File

@ -151,6 +151,6 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<restx.version>0.35-rc4</restx.version>
<logback-classic.version>1.0.13</logback-classic.version>
<logback-classic.version>1.2.3</logback-classic.version>
</properties>
</project>

6
restx/src/main/java/restx/demo/rest/HelloResource.java
View File

@ -3,6 +3,8 @@ package restx.demo.rest;
import restx.demo.domain.Message;
import restx.demo.Roles;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import restx.annotations.GET;
import restx.annotations.POST;
import restx.annotations.RestxResource;
@ -29,7 +31,7 @@ public class HelloResource {
return new Message().setMessage(String.format(
"hello %s, it's %s",
RestxSession.current().getPrincipal().get().getName(),
DateTime.now().toString("HH:mm:ss")));
DateTime.now(DateTimeZone.UTC).toString("HH:mm:ss")));
}
/**
@ -44,7 +46,7 @@ public class HelloResource {
public Message helloPublic(String who) {
return new Message().setMessage(String.format(
"hello %s, it's %s",
who, DateTime.now().toString("HH:mm:ss")));
who, DateTime.now(DateTimeZone.UTC).toString("HH:mm:ss")));
}
public static class MyPOJO {

2
restx/src/test/resources/specs/hello/should_admin_say_hello.spec.yaml
View File

@ -7,4 +7,4 @@ wts:
GET message
$RestxSession: {"_expires":"2013-09-27T01:18:00.822+02:00","principal":"admin","sessionKey":"e2b4430f-9541-4602-9a3a-413d17c56a6b"}
then: |
{"message":"hello admin, it's 01:18:00"}
{"message":"hello admin, it's 23:18:00"}

2
restx/src/test/resources/specs/hello/should_anyone_say_hello.spec.yaml
View File

@ -5,4 +5,4 @@ wts:
- when: |
GET hello?who=xavier
then: |
{"message":"hello xavier, it's 01:18:00"}
{"message":"hello xavier, it's 23:18:00"}

2
restx/src/test/resources/specs/hello/should_user1_say_hello.spec.yaml
View File

@ -7,4 +7,4 @@ wts:
GET message
$RestxSession: {"_expires":"2013-09-27T01:18:00.822+02:00","principal":"user1","sessionKey":"e2b4430f-9541-4602-9a3a-413d17c56a6b"}
then: |
{"message":"hello user1, it's 01:18:00"}
{"message":"hello user1, it's 23:18:00"}