Merge branch 'main' into fix-test-cluster

.github/workflows/parallel-test.yml

@@ -23,4 +23,4 @@ jobs:
       - name: Execute tests
         id: test
         run: |
-          mvn clean test integration-test verify --projects common,resource-shared-models,customer-shared-models,service-shared-models,product-shared-models,${{matrix.module}} -Dbroker=orion-ld
+          mvn clean test integration-test verify --projects common,resource-shared-models,customer-shared-models,service-shared-models,product-shared-models,${{matrix.module}} -Dbroker=orion-ld -Dcache=in-memory

.github/workflows/test-caches.yaml

@@ -0,0 +1,34 @@
+name: Test different caches
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
+      - unlabeled
+  push:
+    branches:
+      - main
+
+jobs:
+  it:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        cache: [in-memory, redis]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '17'
+          java-package: jdk
+
+      - name: Execute tests
+        id: test
+        run: |
+          mvn clean test integration-test verify -Dcache=${{matrix.cache}}

account/src/main/resources/application-in-memory.yaml

@@ -0,0 +1,11 @@
+micronaut:
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+    subscriptions:
+      maximumSize: 1000
+      expire-after-write: 14d
+      expire-after-access: 14d

account/src/main/resources/application.yaml

@@ -1,12 +1,5 @@
 micronaut:
 
-  caches:
-    entities:
-      maximumSize: 1000
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-
   server:
     port: 8632
 

account/src/test/resources/application-in-memory.yaml

@@ -0,0 +1,11 @@
+micronaut:
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+    subscriptions:
+      maximumSize: 1000
+      expire-after-write: 10s
+      expire-after-access: 10s

account/src/test/resources/application-redis.yaml

@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 10s
+      expire-after-access: 10s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer

account/src/test/resources/application.yaml

@@ -1,12 +1,5 @@
 micronaut:
 
-  caches:
-    entities:
-      maximumSize: 1000
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-
   server:
     port: 8632
 

agreement/src/main/resources/application-in-memory.yaml

@@ -0,0 +1,11 @@
+micronaut:
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+    subscriptions:
+      maximumSize: 1000
+      expire-after-write: 14d
+      expire-after-access: 14d

agreement/src/main/resources/application.yaml

@@ -3,13 +3,6 @@ micronaut:
   server:
     port: 8632
 
-  caches:
-    entities:
-      maximumSize: 1000
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-
   metrics:
     enabled: true
     export:

agreement/src/test/resources/application-in-memory.yaml

@@ -0,0 +1,11 @@
+micronaut:
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+    subscriptions:
+      maximumSize: 1000
+      expire-after-write: 10s
+      expire-after-access: 10s

agreement/src/test/resources/application-redis.yaml

@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 10s
+      expire-after-access: 10s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer

agreement/src/test/resources/application.yaml

@@ -35,18 +35,4 @@ loggers:
 
 ---
 general:
-  contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 10s
-      expire-after-access: 10s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+  contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld

customer-bill-management/src/main/resources/application-in-memory.yaml

@@ -0,0 +1,11 @@
+micronaut:
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+    subscriptions:
+      maximumSize: 1000
+      expire-after-write: 14d
+      expire-after-access: 14d

customer-bill-management/src/main/resources/application.yaml

@@ -3,14 +3,6 @@ micronaut:
   server:
     port: 8632
 
-  caches:
-    entities:
-      maximumSize: 1000
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-
-
   metrics:
     enabled: true
     export:

customer-bill-management/src/test/resources/application-in-memory.yaml

@@ -0,0 +1,11 @@
+micronaut:
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+    subscriptions:
+      maximumSize: 1000
+      expire-after-write: 10s
+      expire-after-access: 10s

customer-bill-management/src/test/resources/application-redis.yaml

@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 10s
+      expire-after-access: 10s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer

customer-bill-management/src/test/resources/application.yaml

@@ -35,18 +35,4 @@ loggers:
 
 ---
 general:
-  contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 10s
-      expire-after-access: 10s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+  contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld

customer-management/src/main/resources/application-in-memory.yaml

@@ -0,0 +1,11 @@
+micronaut:
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+    subscriptions:
+      maximumSize: 1000
+      expire-after-write: 14d
+      expire-after-access: 14d

customer-management/src/main/resources/application.yaml

@@ -10,13 +10,6 @@ micronaut:
         step: PT2s
         descriptions: false
 
-  caches:
-    entities:
-      maximumSize: 1000
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-
   http:
     services:
       read-timeout: 30s

customer-management/src/test/resources/application-in-memory.yaml

@@ -0,0 +1,11 @@
+micronaut:
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+    subscriptions:
+      maximumSize: 1000
+      expire-after-write: 10s
+      expire-after-access: 10s

customer-management/src/test/resources/application-redis.yaml

@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 10s
+      expire-after-access: 10s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer

customer-management/src/test/resources/application.yaml

@@ -35,18 +35,4 @@ loggers:
 
 ---
 general:
-  contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 10s
-      expire-after-access: 10s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+  contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld

party-catalog/src/main/resources/application-in-memory.yaml

@@ -0,0 +1,11 @@
+micronaut:
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+    subscriptions:
+      maximumSize: 1000
+      expire-after-write: 14d
+      expire-after-access: 14d

party-catalog/src/main/resources/application.yaml

@@ -10,13 +10,6 @@ micronaut:
         step: PT2s
         descriptions: false
 
-  caches:
-    entities:
-      maximumSize: 1000
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-
   http:
     services:
       read-timeout: 30s

party-catalog/src/test/resources/application-in-memory.yaml

@@ -0,0 +1,11 @@
+micronaut:
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+    subscriptions:
+      maximumSize: 1000
+      expire-after-write: 10s
+      expire-after-access: 10s

party-catalog/src/test/resources/application-redis.yaml

@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 10s
+      expire-after-access: 10s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer