fixed a few minor issues

FINTLabs · Oct 23, 2018 · d766b98 · d766b98
1 parent dcf9046
commit d766b98
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 13 deletions.
diff --git a/...er/events/testMode/EnabledIfTestMode.java → ...er/events/testmode/EnabledIfTestMode.java b/...er/events/testMode/EnabledIfTestMode.java → ...er/events/testmode/EnabledIfTestMode.java
@@ -1,4 +1,4 @@
-package no.fint.provider.events.testMode;
+package no.fint.provider.events.testmode;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 

diff --git a/...er/events/testMode/TestModeConstants.java → ...er/events/testmode/TestModeConstants.java b/...er/events/testMode/TestModeConstants.java → ...er/events/testmode/TestModeConstants.java
@@ -1,4 +1,4 @@
-package no.fint.provider.events.testMode;
+package no.fint.provider.events.testmode;
 
 public enum TestModeConstants {
     ;

diff --git a/...nts/testMode/adapter/TestModeAdapter.java → ...nts/testmode/adapter/TestModeAdapter.java b/...nts/testMode/adapter/TestModeAdapter.java → ...nts/testmode/adapter/TestModeAdapter.java
@@ -1,4 +1,4 @@
-package no.fint.provider.events.testMode.adapter;
+package no.fint.provider.events.testmode.adapter;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -8,10 +8,11 @@
 import no.fint.event.model.Status;
 import no.fint.event.model.health.Health;
 import no.fint.event.model.health.HealthStatus;
-import no.fint.provider.events.testMode.EnabledIfTestMode;
-import no.fint.provider.events.testMode.TestModeConstants;
+import no.fint.provider.events.testmode.EnabledIfTestMode;
+import no.fint.provider.events.testmode.TestModeConstants;
 import no.fint.sse.AbstractEventListener;
 import no.fint.sse.FintSse;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -28,13 +29,20 @@
 @Slf4j
 @Component
 public class TestModeAdapter extends AbstractEventListener {
+    @Value("${server.context-path:/}")
+    private String contextPath;
+
+    @Value("${server.port:8080}")
+    private int port;
+
     private FintSse fintSse;
     private RestTemplate restTemplate = new RestTemplate();
 
     @PostConstruct
     public void init() {
         log.info("Test-mode enabled, starting sse adapter");
-        fintSse = new FintSse("http://localhost:8080/provider/sse/%s");
+        String sseUrl = "http://localhost:" + port + "/" + contextPath + "/sse/%s";
+        fintSse = new FintSse(sseUrl);
         fintSse.connect(this, ImmutableMap.of(
                 HeaderConstants.ORG_ID, TestModeConstants.ORGID,
                 HeaderConstants.CLIENT, TestModeConstants.CLIENT

diff --git a/...ents/testMode/consumer/ReceivedEvent.java → ...ents/testmode/consumer/ReceivedEvent.java b/...ents/testMode/consumer/ReceivedEvent.java → ...ents/testmode/consumer/ReceivedEvent.java
@@ -1,4 +1,4 @@
-package no.fint.provider.events.testMode.consumer;
+package no.fint.provider.events.testmode.consumer;
 
 import lombok.Getter;
 import no.fint.event.model.Event;
@@ -7,12 +7,16 @@
 @Getter
 class ReceivedEvent {
     private String corrId;
+    private String action;
     private Status status;
     private String data;
 
     ReceivedEvent(Event event) {
         this.corrId = event.getCorrId();
+        this.action = event.getAction();
         this.status = event.getStatus();
-        this.data = event.getData().get(0).toString();
+        if (event.getData().size() > 0) {
+            this.data = event.getData().get(0).toString();
+        }
     }
 }
diff --git a/...testMode/consumer/TestModeController.java → ...testmode/consumer/TestModeController.java b/...testMode/consumer/TestModeController.java → ...testmode/consumer/TestModeController.java
@@ -1,13 +1,13 @@
-package no.fint.provider.events.testMode.consumer;
+package no.fint.provider.events.testmode.consumer;
 
 
 import com.google.common.collect.ImmutableMap;
 import lombok.extern.slf4j.Slf4j;
 import no.fint.event.model.Event;
 import no.fint.events.FintEventListener;
 import no.fint.events.FintEvents;
-import no.fint.provider.events.testMode.EnabledIfTestMode;
-import no.fint.provider.events.testMode.TestModeConstants;
+import no.fint.provider.events.testmode.EnabledIfTestMode;
+import no.fint.provider.events.testmode.TestModeConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,6 +32,7 @@ public class TestModeController implements FintEventListener {
     public void init() {
         log.info("Test mode enabled, starting consumer");
         fintEvents.registerUpstreamListener(TestModeConstants.ORGID, this);
+        fintEvents.registerUpstreamSystemListener(this);
     }
 
     @PostMapping

diff --git a/...nts/testMode/consumer/TestModeSpec.groovy → ...nts/testmode/consumer/TestModeSpec.groovy b/...nts/testMode/consumer/TestModeSpec.groovy → ...nts/testmode/consumer/TestModeSpec.groovy
@@ -1,6 +1,6 @@
-package no.fint.provider.events.testMode.consumer
+package no.fint.provider.events.testmode.consumer
 
-import no.fint.provider.events.testMode.adapter.TestModeAdapter
+import no.fint.provider.events.testmode.adapter.TestModeAdapter
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import spock.lang.Specification