diff --git a/.github/workflows/parallel-test.yml b/.github/workflows/parallel-test.yml index 1d1d6c2e..c5c800a8 100644 --- a/.github/workflows/parallel-test.yml +++ b/.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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/.github/workflows/test-caches.yaml b/.github/workflows/test-caches.yaml new file mode 100644 index 00000000..ea1016cc --- /dev/null +++ b/.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}} \ No newline at end of file diff --git a/account/src/main/resources/application-in-memory.yaml b/account/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/account/src/main/resources/application.yaml b/account/src/main/resources/application.yaml index 12e6198f..dcea27df 100644 --- a/account/src/main/resources/application.yaml +++ b/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 diff --git a/account/src/test/resources/application-in-memory.yaml b/account/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/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 \ No newline at end of file diff --git a/account/src/test/resources/application-redis.yaml b/account/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/account/src/test/resources/application.yaml b/account/src/test/resources/application.yaml index 12e6198f..dcea27df 100644 --- a/account/src/test/resources/application.yaml +++ b/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 diff --git a/agreement/src/main/resources/application-in-memory.yaml b/agreement/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/agreement/src/main/resources/application.yaml b/agreement/src/main/resources/application.yaml index ca886b68..2381def1 100644 --- a/agreement/src/main/resources/application.yaml +++ b/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: diff --git a/agreement/src/test/resources/application-in-memory.yaml b/agreement/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/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 \ No newline at end of file diff --git a/agreement/src/test/resources/application-redis.yaml b/agreement/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/agreement/src/test/resources/application.yaml b/agreement/src/test/resources/application.yaml index b567cde9..fde4f97e 100644 --- a/agreement/src/test/resources/application.yaml +++ b/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 \ No newline at end of file + contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld \ No newline at end of file diff --git a/customer-bill-management/src/main/resources/application-in-memory.yaml b/customer-bill-management/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/customer-bill-management/src/main/resources/application.yaml b/customer-bill-management/src/main/resources/application.yaml index 13c28469..2381def1 100644 --- a/customer-bill-management/src/main/resources/application.yaml +++ b/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: diff --git a/customer-bill-management/src/test/resources/application-in-memory.yaml b/customer-bill-management/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/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 \ No newline at end of file diff --git a/customer-bill-management/src/test/resources/application-redis.yaml b/customer-bill-management/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/customer-bill-management/src/test/resources/application.yaml b/customer-bill-management/src/test/resources/application.yaml index b567cde9..fde4f97e 100644 --- a/customer-bill-management/src/test/resources/application.yaml +++ b/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 \ No newline at end of file + contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld \ No newline at end of file diff --git a/customer-management/src/main/resources/application-in-memory.yaml b/customer-management/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/customer-management/src/main/resources/application.yaml b/customer-management/src/main/resources/application.yaml index 167db684..f930b101 100644 --- a/customer-management/src/main/resources/application.yaml +++ b/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 diff --git a/customer-management/src/test/resources/application-in-memory.yaml b/customer-management/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/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 \ No newline at end of file diff --git a/customer-management/src/test/resources/application-redis.yaml b/customer-management/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/customer-management/src/test/resources/application.yaml b/customer-management/src/test/resources/application.yaml index b567cde9..fde4f97e 100644 --- a/customer-management/src/test/resources/application.yaml +++ b/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 \ No newline at end of file + contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld \ No newline at end of file diff --git a/party-catalog/src/main/resources/application-in-memory.yaml b/party-catalog/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/party-catalog/src/main/resources/application.yaml b/party-catalog/src/main/resources/application.yaml index 27392049..dcea27df 100644 --- a/party-catalog/src/main/resources/application.yaml +++ b/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 diff --git a/party-catalog/src/test/resources/application-in-memory.yaml b/party-catalog/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/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 \ No newline at end of file diff --git a/party-catalog/src/test/resources/application-redis.yaml b/party-catalog/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/party-catalog/src/test/resources/application.yaml b/party-catalog/src/test/resources/application.yaml index b567cde9..fde4f97e 100644 --- a/party-catalog/src/test/resources/application.yaml +++ b/party-catalog/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 \ No newline at end of file + contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld \ No newline at end of file diff --git a/pom.xml b/pom.xml index 150efb8a..19e2ec2a 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,8 @@ ${project.build.directory}/site/spotbugs orion-ld + + in-memory API-URL @@ -490,7 +492,7 @@ ${project.build.outputDirectory} true ${failsafe.jacoco.args} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens - java.base/java.time=ALL-UNNAMED -Dmicronaut.environments=${broker} + java.base/java.time=ALL-UNNAMED -Dmicronaut.environments=${cache},${broker} diff --git a/product-catalog/src/main/resources/application-in-memory.yaml b/product-catalog/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/product-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 \ No newline at end of file diff --git a/product-catalog/src/main/resources/application.yaml b/product-catalog/src/main/resources/application.yaml index 587936d4..2381def1 100644 --- a/product-catalog/src/main/resources/application.yaml +++ b/product-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 diff --git a/product-catalog/src/test/resources/application-in-memory.yaml b/product-catalog/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/product-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 \ No newline at end of file diff --git a/product-catalog/src/test/resources/application-redis.yaml b/product-catalog/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/product-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 \ No newline at end of file diff --git a/product-catalog/src/test/resources/application.yaml b/product-catalog/src/test/resources/application.yaml index b567cde9..fde4f97e 100644 --- a/product-catalog/src/test/resources/application.yaml +++ b/product-catalog/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 \ No newline at end of file + contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld \ No newline at end of file diff --git a/product-inventory/src/main/resources/application-in-memory.yaml b/product-inventory/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/product-inventory/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 \ No newline at end of file diff --git a/product-inventory/src/main/resources/application.yaml b/product-inventory/src/main/resources/application.yaml index 587936d4..2381def1 100644 --- a/product-inventory/src/main/resources/application.yaml +++ b/product-inventory/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 diff --git a/product-inventory/src/test/resources/application-in-memory.yaml b/product-inventory/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/product-inventory/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 \ No newline at end of file diff --git a/product-inventory/src/test/resources/application-redis.yaml b/product-inventory/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/product-inventory/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 \ No newline at end of file diff --git a/product-inventory/src/test/resources/application.yaml b/product-inventory/src/test/resources/application.yaml index d8b9204c..2381def1 100644 --- a/product-inventory/src/test/resources/application.yaml +++ b/product-inventory/src/test/resources/application.yaml @@ -36,18 +36,4 @@ loggers: --- general: contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld - serverHost: http://localhost:8632 - ---- -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 \ No newline at end of file + serverHost: http://localhost:8632 \ No newline at end of file diff --git a/product-ordering-management/src/main/resources/application-in-memory.yaml b/product-ordering-management/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/product-ordering-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 \ No newline at end of file diff --git a/product-ordering-management/src/main/resources/application.yaml b/product-ordering-management/src/main/resources/application.yaml index 587936d4..2381def1 100644 --- a/product-ordering-management/src/main/resources/application.yaml +++ b/product-ordering-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 diff --git a/product-ordering-management/src/test/resources/application-in-memory.yaml b/product-ordering-management/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/product-ordering-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 \ No newline at end of file diff --git a/product-ordering-management/src/test/resources/application-redis.yaml b/product-ordering-management/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/product-ordering-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 \ No newline at end of file diff --git a/product-ordering-management/src/test/resources/application.yaml b/product-ordering-management/src/test/resources/application.yaml index 76666151..57a4d739 100644 --- a/product-ordering-management/src/test/resources/application.yaml +++ b/product-ordering-management/src/test/resources/application.yaml @@ -39,18 +39,4 @@ general: ngsildOrQueryKey: "," encloseQuery: false contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld - serverHost: http://localhost:8632 - ---- -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 \ No newline at end of file + serverHost: http://localhost:8632 \ No newline at end of file diff --git a/resource-catalog/src/main/resources/application-in-memory.yaml b/resource-catalog/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/resource-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 \ No newline at end of file diff --git a/resource-catalog/src/main/resources/application.yaml b/resource-catalog/src/main/resources/application.yaml index 587936d4..2381def1 100644 --- a/resource-catalog/src/main/resources/application.yaml +++ b/resource-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 diff --git a/resource-catalog/src/test/resources/application-in-memory.yaml b/resource-catalog/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/resource-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 \ No newline at end of file diff --git a/resource-catalog/src/test/resources/application-redis.yaml b/resource-catalog/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/resource-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 \ No newline at end of file diff --git a/resource-catalog/src/test/resources/application.yaml b/resource-catalog/src/test/resources/application.yaml index b567cde9..fde4f97e 100644 --- a/resource-catalog/src/test/resources/application.yaml +++ b/resource-catalog/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 \ No newline at end of file + contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld \ No newline at end of file diff --git a/resource-function-activation/src/main/resources/application-in-memory.yaml b/resource-function-activation/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/resource-function-activation/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 \ No newline at end of file diff --git a/resource-function-activation/src/main/resources/application.yaml b/resource-function-activation/src/main/resources/application.yaml index 27392049..dcea27df 100644 --- a/resource-function-activation/src/main/resources/application.yaml +++ b/resource-function-activation/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 diff --git a/resource-function-activation/src/test/resources/application-in-memory.yaml b/resource-function-activation/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/resource-function-activation/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 \ No newline at end of file diff --git a/resource-function-activation/src/test/resources/application-redis.yaml b/resource-function-activation/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/resource-function-activation/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 \ No newline at end of file diff --git a/resource-function-activation/src/test/resources/application.yaml b/resource-function-activation/src/test/resources/application.yaml index d8b9204c..2381def1 100644 --- a/resource-function-activation/src/test/resources/application.yaml +++ b/resource-function-activation/src/test/resources/application.yaml @@ -36,18 +36,4 @@ loggers: --- general: contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld - serverHost: http://localhost:8632 - ---- -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 \ No newline at end of file + serverHost: http://localhost:8632 \ No newline at end of file diff --git a/resource-inventory/src/main/resources/application-in-memory.yaml b/resource-inventory/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/resource-inventory/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 \ No newline at end of file diff --git a/resource-inventory/src/main/resources/application.yaml b/resource-inventory/src/main/resources/application.yaml index 587936d4..2381def1 100644 --- a/resource-inventory/src/main/resources/application.yaml +++ b/resource-inventory/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 diff --git a/resource-inventory/src/test/resources/application-in-memory.yaml b/resource-inventory/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/resource-inventory/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 \ No newline at end of file diff --git a/resource-inventory/src/test/resources/application-redis.yaml b/resource-inventory/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/resource-inventory/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 \ No newline at end of file diff --git a/resource-inventory/src/test/resources/application.yaml b/resource-inventory/src/test/resources/application.yaml index d8b9204c..2381def1 100644 --- a/resource-inventory/src/test/resources/application.yaml +++ b/resource-inventory/src/test/resources/application.yaml @@ -36,18 +36,4 @@ loggers: --- general: contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld - serverHost: http://localhost:8632 - ---- -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 \ No newline at end of file + serverHost: http://localhost:8632 \ No newline at end of file diff --git a/service-catalog/src/main/resources/application-in-memory.yaml b/service-catalog/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/service-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 \ No newline at end of file diff --git a/service-catalog/src/main/resources/application.yaml b/service-catalog/src/main/resources/application.yaml index 587936d4..2381def1 100644 --- a/service-catalog/src/main/resources/application.yaml +++ b/service-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 diff --git a/service-catalog/src/test/resources/application-in-memory.yaml b/service-catalog/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/service-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 \ No newline at end of file diff --git a/service-catalog/src/test/resources/application-redis.yaml b/service-catalog/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/service-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 \ No newline at end of file diff --git a/service-catalog/src/test/resources/application.yaml b/service-catalog/src/test/resources/application.yaml index b567cde9..fde4f97e 100644 --- a/service-catalog/src/test/resources/application.yaml +++ b/service-catalog/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 \ No newline at end of file + contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld \ No newline at end of file diff --git a/usage-management/src/main/resources/application-in-memory.yaml b/usage-management/src/main/resources/application-in-memory.yaml new file mode 100644 index 00000000..572d7336 --- /dev/null +++ b/usage-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 \ No newline at end of file diff --git a/usage-management/src/main/resources/application.yaml b/usage-management/src/main/resources/application.yaml index 12e6198f..dcea27df 100644 --- a/usage-management/src/main/resources/application.yaml +++ b/usage-management/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 diff --git a/usage-management/src/test/resources/application-in-memory.yaml b/usage-management/src/test/resources/application-in-memory.yaml new file mode 100644 index 00000000..3a8c3c7e --- /dev/null +++ b/usage-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 \ No newline at end of file diff --git a/usage-management/src/test/resources/application-redis.yaml b/usage-management/src/test/resources/application-redis.yaml new file mode 100644 index 00000000..ffad37c0 --- /dev/null +++ b/usage-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 \ No newline at end of file diff --git a/usage-management/src/test/resources/application.yaml b/usage-management/src/test/resources/application.yaml index 12e6198f..dcea27df 100644 --- a/usage-management/src/test/resources/application.yaml +++ b/usage-management/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