updated to new versions of fint-events and fint-event-model, upgraded…

… to version 4.0 of gradle
FINTLabs · Jun 15, 2017 · 79f33c0 · 79f33c0
1 parent 8458790
commit 79f33c0
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 48 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    apply from: 'https://raw.githubusercontent.com/FINTlibs/fint-buildscripts/v1.0.12/dependencies.gradle'
+    apply from: 'https://raw.githubusercontent.com/FINTlibs/fint-buildscripts/v1.0.14/dependencies.gradle'
     ext {
         springBootVersion = springBootVersion
     }
@@ -23,7 +23,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'maven'
 apply plugin: 'jacoco'
 
-apply from: 'https://raw.githubusercontent.com/FINTlibs/fint-buildscripts/v1.0.12/version.gradle'
+apply from: 'https://raw.githubusercontent.com/FINTlibs/fint-buildscripts/v1.0.14/version.gradle'
 jar {
     version = createVersion()
     baseName = 'fint-pwfa-consumer'
@@ -51,11 +51,11 @@ repositories {
 
 dependencies {
     compile('no.fint:fint-relation-model:0.0.22')
-    compile('no.fint:fint-event-model:0.0.25')
+    compile('no.fint:fint-event-model:0.0.26')
     compile('no.fint:fint-pwfa-model:0.0.1')
 
     compile('no.fint:fint-relations:0.0.20')
-    compile('no.fint:fint-events:0.1.32')
+    compile('no.fint:fint-events:0.1.33')
     compile('no.fint:fint-audit-mongo-plugin:0.0.13')
     compile('no.fint:fint-cache:0.0.3')
 
@@ -93,4 +93,4 @@ jacocoTestReport {
     }
 }
 
-apply from: 'https://raw.githubusercontent.com/FINTlibs/fint-buildscripts/v1.0.12/dependencyReport.gradle'
+apply from: 'https://raw.githubusercontent.com/FINTlibs/fint-buildscripts/v1.0.14/dependencyReport.gradle'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Feb 12 21:15:25 CET 2017
+#Fri Jun 16 00:07:22 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
diff --git a/gradlew b/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

diff --git a/src/main/java/no/fint/consumer/admin/AdminController.java b/src/main/java/no/fint/consumer/admin/AdminController.java
@@ -7,6 +7,7 @@
 import no.fint.consumer.event.EventListener;
 import no.fint.event.model.DefaultActions;
 import no.fint.event.model.Event;
+import no.fint.event.model.HeaderConstants;
 import no.fint.event.model.health.Health;
 import no.fint.events.FintEvents;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,13 +38,16 @@ public class AdminController {
     private FintEvents fintEvents;
 
     @GetMapping("/health")
-    public ResponseEntity healthCheck(@RequestHeader(value = Constants.HEADER_ORGID) String orgId,
-                                      @RequestHeader(value = Constants.HEADER_CLIENT) String client) {
-        Event<Health> event = new Event<>(orgId, Constants.SOURCE, DefaultActions.HEALTH.name(), client);
+    public ResponseEntity healthCheck(@RequestHeader(HeaderConstants.ORG_ID) String orgId,
+                                      @RequestHeader(HeaderConstants.CLIENT) String client) {
+        Event<Health> event = new Event<>(orgId, Constants.SOURCE, DefaultActions.HEALTH, client);
+        event.addData(new Health(Constants.CLIENT, "Sent from consumer"));
         Optional<Event<Health>> health = consumerEventUtil.healthCheck(event);
 
         if (health.isPresent()) {
-            return ResponseEntity.ok(health.get());
+            Event<Health> receivedHealth = health.get();
+            receivedHealth.addData(new Health(Constants.CLIENT, "Received in consumer"));
+            return ResponseEntity.ok(receivedHealth);
         } else {
             event.setMessage("No response from adapter");
             return ResponseEntity.status(HttpStatus.GATEWAY_TIMEOUT).body(event);
@@ -55,7 +59,7 @@ public ResponseEntity registerOrganization(@PathVariable String orgId) {
         if (orgIds.containsKey(orgId)) {
             return ResponseEntity.badRequest().body(String.format("OrgId %s is already registered", orgId));
         } else {
-            Event event = new Event(orgId, Constants.SOURCE, DefaultActions.REGISTER_ORG_ID.name(), "pwfa");
+            Event event = new Event(orgId, Constants.SOURCE, DefaultActions.REGISTER_ORG_ID, Constants.CLIENT);
             fintEvents.sendDownstream("system", event);
 
             fintEvents.registerUpstreamListener(EventListener.class, orgId);

diff --git a/src/main/java/no/fint/consumer/controller/Constants.java b/src/main/java/no/fint/consumer/controller/Constants.java
@@ -3,7 +3,6 @@
 public enum Constants {
     ;
 
-    public static final String HEADER_ORGID = "x-org-id";
-    public static final String HEADER_CLIENT = "x-client";
     public static final String SOURCE = "pwfa";
+    public static final String CLIENT = "pwfa";
 }
diff --git a/src/main/java/no/fint/consumer/controller/DogController.java b/src/main/java/no/fint/consumer/controller/DogController.java
@@ -5,6 +5,7 @@
 import no.fint.consumer.event.EventListener;
 import no.fint.event.model.Event;
 import no.fint.event.model.EventUtil;
+import no.fint.event.model.HeaderConstants;
 import no.fint.events.FintEvents;
 import no.fint.model.relation.FintResource;
 import no.fint.pwfa.model.Dog;
@@ -34,9 +35,9 @@ public class DogController {
 
     @FintRelations
     @GetMapping
-    public ResponseEntity getAllDogs(@RequestHeader(value = Constants.HEADER_ORGID) String orgId,
-                                     @RequestHeader(value = Constants.HEADER_CLIENT) String client) throws InterruptedException {
-        Event<Void> event = new Event<>(orgId, Constants.SOURCE, Actions.GET_ALL_DOGS.name(), client);
+    public ResponseEntity getAllDogs(@RequestHeader(HeaderConstants.ORG_ID) String orgId,
+                                     @RequestHeader(HeaderConstants.CLIENT) String client) throws InterruptedException {
+        Event<Void> event = new Event<>(orgId, Constants.SOURCE, Actions.GET_ALL_DOGS, client);
         fintEvents.sendDownstream(orgId, event);
 
         RBlockingQueue<Event<FintResource>> tempQueue = fintEvents.getTempQueue(EventListener.TEMP_QUEUE_PREFIX + event.getCorrId());
@@ -47,9 +48,9 @@ public ResponseEntity getAllDogs(@RequestHeader(value = Constants.HEADER_ORGID)
     @FintRelations
     @GetMapping("/{id}")
     public ResponseEntity getDog(@PathVariable String id,
-                                 @RequestHeader(value = Constants.HEADER_ORGID) String orgId,
-                                 @RequestHeader(value = Constants.HEADER_CLIENT) String client) throws InterruptedException {
-        Event<Void> event = new Event<>(orgId, Constants.SOURCE, Actions.GET_DOG.name(), client);
+                                 @RequestHeader(HeaderConstants.ORG_ID) String orgId,
+                                 @RequestHeader(HeaderConstants.CLIENT) String client) throws InterruptedException {
+        Event<Void> event = new Event<>(orgId, Constants.SOURCE, Actions.GET_DOG, client);
         event.setQuery(id);
         fintEvents.sendDownstream(orgId, event);
 

diff --git a/src/main/java/no/fint/consumer/controller/OwnerController.java b/src/main/java/no/fint/consumer/controller/OwnerController.java
@@ -5,6 +5,7 @@
 import no.fint.consumer.event.EventListener;
 import no.fint.event.model.Event;
 import no.fint.event.model.EventUtil;
+import no.fint.event.model.HeaderConstants;
 import no.fint.events.FintEvents;
 import no.fint.model.relation.FintResource;
 import no.fint.pwfa.model.Owner;
@@ -34,9 +35,9 @@ public class OwnerController {
 
     @FintRelations
     @GetMapping
-    public ResponseEntity getAllOwners(@RequestHeader(value = Constants.HEADER_ORGID) String orgId,
-                                       @RequestHeader(value = Constants.HEADER_CLIENT) String client) throws InterruptedException {
-        Event<Void> event = new Event<>(orgId, Constants.SOURCE, Actions.GET_ALL_OWNERS.name(), client);
+    public ResponseEntity getAllOwners(@RequestHeader(HeaderConstants.ORG_ID) String orgId,
+                                       @RequestHeader(HeaderConstants.CLIENT) String client) throws InterruptedException {
+        Event<Void> event = new Event<>(orgId, Constants.SOURCE, Actions.GET_ALL_OWNERS, client);
         fintEvents.sendDownstream(orgId, event);
 
         RBlockingQueue<Event<FintResource>> tempQueue = fintEvents.getTempQueue(EventListener.TEMP_QUEUE_PREFIX + event.getCorrId());
@@ -47,9 +48,9 @@ public ResponseEntity getAllOwners(@RequestHeader(value = Constants.HEADER_ORGID
     @FintRelations
     @GetMapping("/{id}")
     public ResponseEntity getOwner(@PathVariable String id,
-                                   @RequestHeader(value = Constants.HEADER_ORGID) String orgId,
-                                   @RequestHeader(value = Constants.HEADER_CLIENT) String client) throws InterruptedException {
-        Event<Void> event = new Event<>(orgId, Constants.SOURCE, Actions.GET_OWNER.name(), client);
+                                   @RequestHeader(HeaderConstants.ORG_ID) String orgId,
+                                   @RequestHeader(HeaderConstants.CLIENT) String client) throws InterruptedException {
+        Event<Void> event = new Event<>(orgId, Constants.SOURCE, Actions.GET_OWNER, client);
         event.setQuery(id);
         fintEvents.sendDownstream(orgId, event);
 

diff --git a/src/test/groovy/no/fint/consumer/admin/AdminControllerSpec.groovy b/src/test/groovy/no/fint/consumer/admin/AdminControllerSpec.groovy
@@ -1,9 +1,9 @@
 package no.fint.consumer.admin
 
-import no.fint.consumer.controller.Constants
 import no.fint.consumer.event.ConsumerEventUtil
 import no.fint.event.model.DefaultActions
 import no.fint.event.model.Event
+import no.fint.event.model.HeaderConstants
 import no.fint.events.FintEvents
 import no.fint.test.utils.MockMvcSpecification
 import org.springframework.http.HttpHeaders
@@ -25,7 +25,7 @@ class AdminControllerSpec extends MockMvcSpecification {
 
     def "Check response on healthcheck"() {
         when:
-        def response = mockMvc.perform(get("/admin/health").header(Constants.HEADER_ORGID, "mock.no").header(Constants.HEADER_CLIENT, "mock"))
+        def response = mockMvc.perform(get("/admin/health").header(HeaderConstants.ORG_ID, "mock.no").header(HeaderConstants.CLIENT, "mock"))
 
         then:
         1 * consumerEventUtil.healthCheck(_ as Event) >> Optional.of(new Event(action: DefaultActions.HEALTH.name()))
@@ -36,7 +36,7 @@ class AdminControllerSpec extends MockMvcSpecification {
 
     def "Check response on healthcheck is empty"() {
         when:
-        def response = mockMvc.perform(get("/admin/health").header(Constants.HEADER_ORGID, "mock.no").header(Constants.HEADER_CLIENT, "mock"))
+        def response = mockMvc.perform(get("/admin/health").header(HeaderConstants.ORG_ID, "mock.no").header(HeaderConstants.CLIENT, "mock"))
 
         then:
         1 * consumerEventUtil.healthCheck(_ as Event) >> Optional.empty()

diff --git a/src/test/groovy/no/fint/consumer/controller/DogControllerSpec.groovy b/src/test/groovy/no/fint/consumer/controller/DogControllerSpec.groovy
@@ -2,6 +2,7 @@ package no.fint.consumer.controller
 
 import no.fint.consumer.event.Actions
 import no.fint.event.model.Event
+import no.fint.event.model.HeaderConstants
 import no.fint.events.FintEvents
 import no.fint.model.relation.FintResource
 import no.fint.pwfa.model.Dog
@@ -36,8 +37,8 @@ class DogControllerSpec extends MockMvcSpecification {
     def "Get all dogs"() {
         when:
         def response = mockMvc.perform(get('/dogs')
-                .header(Constants.HEADER_ORGID, 'mock.no')
-                .header(Constants.HEADER_CLIENT, 'test')
+                .header(HeaderConstants.ORG_ID, 'mock.no')
+                .header(HeaderConstants.CLIENT, 'test')
         )
 
         then:
@@ -50,8 +51,8 @@ class DogControllerSpec extends MockMvcSpecification {
     def "Get dog"() {
         when:
         def response = mockMvc.perform(get('/dogs/1')
-                .header(Constants.HEADER_ORGID, 'mock.no')
-                .header(Constants.HEADER_CLIENT, 'test')
+                .header(HeaderConstants.ORG_ID, 'mock.no')
+                .header(HeaderConstants.CLIENT, 'test')
         )
 
         then:
@@ -65,8 +66,8 @@ class DogControllerSpec extends MockMvcSpecification {
     def "Return status code 500 if response event is null"() {
         when:
         def response = mockMvc.perform(get('/dogs')
-                .header(Constants.HEADER_ORGID, 'mock.no')
-                .header(Constants.HEADER_CLIENT, 'test'))
+                .header(HeaderConstants.ORG_ID, 'mock.no')
+                .header(HeaderConstants.CLIENT, 'test'))
 
         then:
         1 * tempQueue.poll(1, TimeUnit.MINUTES) >> null

diff --git a/src/test/groovy/no/fint/consumer/controller/OwnerControllerSpec.groovy b/src/test/groovy/no/fint/consumer/controller/OwnerControllerSpec.groovy
@@ -2,6 +2,7 @@ package no.fint.consumer.controller
 
 import no.fint.consumer.event.Actions
 import no.fint.event.model.Event
+import no.fint.event.model.HeaderConstants
 import no.fint.events.FintEvents
 import no.fint.model.relation.FintResource
 import no.fint.pwfa.model.Owner
@@ -34,8 +35,8 @@ class OwnerControllerSpec extends MockMvcSpecification {
     def "Get all owners"() {
         when:
         def response = mockMvc.perform(get('/owners')
-                .header(Constants.HEADER_ORGID, 'rogfk.no')
-                .header(Constants.HEADER_CLIENT, 'test'))
+                .header(HeaderConstants.ORG_ID, 'rogfk.no')
+                .header(HeaderConstants.CLIENT, 'test'))
 
 
         then:
@@ -48,8 +49,8 @@ class OwnerControllerSpec extends MockMvcSpecification {
     def "Get owner"() {
         when:
         def response = mockMvc.perform(get('/owners/1')
-                .header(Constants.HEADER_ORGID, 'rogfk.no')
-                .header(Constants.HEADER_CLIENT, 'test'))
+                .header(HeaderConstants.ORG_ID, 'rogfk.no')
+                .header(HeaderConstants.CLIENT, 'test'))
 
         then:
         1 * fintEvents.sendDownstream('rogfk.no', _ as Event)
@@ -61,8 +62,8 @@ class OwnerControllerSpec extends MockMvcSpecification {
     def "Return status code 500 if response event is null"() {
         when:
         def response = mockMvc.perform(get('/owners')
-                .header(Constants.HEADER_ORGID, 'rogfk.no')
-                .header(Constants.HEADER_CLIENT, 'test'))
+                .header(HeaderConstants.ORG_ID, 'rogfk.no')
+                .header(HeaderConstants.CLIENT, 'test'))
 
 
         then:

diff --git a/test-provider/build.gradle b/test-provider/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    apply from: 'https://raw.githubusercontent.com/FINTlibs/fint-buildscripts/v1.0.12/dependencies.gradle'
+    apply from: 'https://raw.githubusercontent.com/FINTlibs/fint-buildscripts/v1.0.14/dependencies.gradle'
     ext {
         springBootVersion = springBootVersion
     }
@@ -32,9 +32,9 @@ repositories {
 dependencies {
     compile('no.fint:fint-relation-model:0.0.22')
     compile('no.fint:fint-administrasjon-model-java:1.0.1')
-    compile('no.fint:fint-event-model:0.0.25')
+    compile('no.fint:fint-event-model:0.0.26')
 
-    compile('no.fint:fint-events:0.1.32')
+    compile('no.fint:fint-events:0.1.33')
 
     compile('org.springframework.boot:spring-boot-starter-web')
     compileOnly('org.projectlombok:lombok')

diff --git a/test-provider/gradle/wrapper/gradle-wrapper.properties b/test-provider/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip