Merge branch 'dkapil-task/BAEL-10944'

lor6 · lor6 · commit fefdba65619c · 2019-02-26T22:38:26.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -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>
diff --git a/restx/pom.xml b/restx/pom.xml
@@ -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>
diff --git a/restx/src/main/java/restx/demo/rest/HelloResource.java b/restx/src/main/java/restx/demo/rest/HelloResource.java
@@ -3,6 +3,8 @@
 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 Message sayHello() {
         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 Message sayHello() {
     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 {
diff --git a/restx/src/test/resources/specs/hello/should_admin_say_hello.spec.yaml b/restx/src/test/resources/specs/hello/should_admin_say_hello.spec.yaml
@@ -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"}
diff --git a/restx/src/test/resources/specs/hello/should_anyone_say_hello.spec.yaml b/restx/src/test/resources/specs/hello/should_anyone_say_hello.spec.yaml
@@ -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"}
diff --git a/restx/src/test/resources/specs/hello/should_user1_say_hello.spec.yaml b/restx/src/test/resources/specs/hello/should_user1_say_hello.spec.yaml
@@ -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"}
