NONRTRIC - dmaap cherry picked from master 30/8930/2 1.1.1
authorPatrikBuhr <patrik.buhr@est.tech>
Mon, 4 Jul 2022 13:28:05 +0000 (15:28 +0200)
committerPatrikBuhr <patrik.buhr@est.tech>
Thu, 25 Aug 2022 05:51:41 +0000 (07:51 +0200)
commit8e52ee5eef1679b2cf642fa27eb7e9d4ad2fbe9d
treebdb3fbf731521932268363ee98113cd860a9a80b
parent1bd32dac8d60ce3c2a763c27bc16d04615ed23e6
NONRTRIC - dmaap cherry picked from master

14 commits

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
Change-Id: I65b198fe2860c51d14bd0ff1fa65f2f97a5062c2

NONRTRIC - dmaap adapter characteristic improvement

Fixed issues with backpressure.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: I5d9a1cb7c741110010e3dd116a5c115061fb59dd

NONRTRIC - dmaap adapter characteristic improvement

Minor changes. Added a testcase.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: Ib45f40763f3124c5e8c32d66e23a7b4a1252e428

NONRTRIC - dmaap adapter characteristic improvement

Minor changes, aesthetics.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: I7dc76691f45d30555be66511e1b78c6e5231d01f

NONRTRIC - dmaap adapter characteristic improvement

Minor changes, renamed some classes.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: I1de5f8d88877b7a8f1693576ac52ca3bf5b5be51

NONRTRIC - dmaap adapter characteristic improvement

Added support for PM filtering of the MO class of the measured object.
Changed the ICS producer ID so that each instance will have a unique ID (using the callback URL).
Changed the Kafka group ID so that each type will have an own group ID
Setting kafka client ID (using the callback URL)

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: I1031802469beb146039ed089e4c80f0ca83d4dd9

NONRTRIC - dmaap adapter characteristic improvement

Minor refactoring

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: Ibedc361673aad2a9362e31651d11853bd282df85

NONRTRIC - bugfix

If the auth-token-file parameter in the file application.yaml is missing, it would not default to an empty file name.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: Icb357e7a44968df07d42299650700f1003d30abd

NONRTRIC - bugfix

Taking care of incorrect/malformed input to the PM parsing.
Removing "map" output from PM filter that should not be there.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: Ic18d8f7ee3176ea39b91c850bec79ce36582c7ef

NONRTRIC - new certs, updated springboot version

Created new certs
Updated springboot version

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: Ie9f798cdb147873fcdc4fd4c9bb911d19abc4e49

NONRTRIC - optimization of PM filtering

If there are many PM job, the PM parsing is done once instead of onced per job.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: I64dc8332f3efd1bd3a284f6896be7bd9a0dd9bf7

NONRTRIC - bugfix

Discarding of empty output filtering.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: I141ed9aea0cb6d893f014ce49bb1d70a0dbaa8f0

NONRTRIC - bugfix

Bugfix reverting vback tosptingboot 2.5.8 (2.6.6) works bad with kafka.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: I20a78bdd0fa5368fa00933bea1293340bffcfbeb

Update license references

Patch set 2: Additional licensing
Patch set 3: Review licensing.
Patch set 4: Rebase and resolve conflict.

Issue-ID: NONRTRIC-779
C-Id: I856e0943d11f2b00f33250786fed6a92d4f11923
Signed-off-by: halil.cakal <halil.cakal@est.tech>
NONRTRIC - Statistics

Added feature for getting statistics.
   GET "/statistics"
Updated to latest 2.5 version of springboot.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-773
C-Id: Ifc0844ca20cab00d3ca99e5b58b2f56721a5e9c0
Change-Id: I747c917dcb25a3f740ad6e7dde301dac0d8c5fd8
43 files changed:
.readthedocs.yaml
LICENSE.txt [new file with mode: 0644]
api/api.json
api/api.yaml
config/README
config/application.yaml
config/application_configuration.json
config/keystore.jks
config/truststore.jks
docs/conf.py
docs/overview.rst
pom.xml
src/main/java/org/oran/dmaapadapter/clients/SecurityContext.java
src/main/java/org/oran/dmaapadapter/configuration/ApplicationConfig.java
src/main/java/org/oran/dmaapadapter/controllers/ErrorResponse.java
src/main/java/org/oran/dmaapadapter/controllers/ProducerCallbacksController.java
src/main/java/org/oran/dmaapadapter/filter/Filter.java [moved from src/main/java/org/oran/dmaapadapter/repository/filters/Filter.java with 50% similarity]
src/main/java/org/oran/dmaapadapter/filter/FilterFactory.java [new file with mode: 0644]
src/main/java/org/oran/dmaapadapter/filter/JsltFilter.java [moved from src/main/java/org/oran/dmaapadapter/repository/filters/JsltFilter.java with 80% similarity]
src/main/java/org/oran/dmaapadapter/filter/JsonPathFilter.java [moved from src/main/java/org/oran/dmaapadapter/repository/filters/JsonPathFilter.java with 76% similarity]
src/main/java/org/oran/dmaapadapter/filter/PmReport.java [moved from src/main/java/org/oran/dmaapadapter/repository/filters/PmReport.java with 81% similarity]
src/main/java/org/oran/dmaapadapter/filter/PmReportFilter.java [moved from src/main/java/org/oran/dmaapadapter/repository/filters/PmReportFilter.java with 64% similarity]
src/main/java/org/oran/dmaapadapter/filter/RegexpFilter.java [moved from src/main/java/org/oran/dmaapadapter/repository/filters/RegexpFilter.java with 77% similarity]
src/main/java/org/oran/dmaapadapter/repository/InfoType.java
src/main/java/org/oran/dmaapadapter/repository/Job.java
src/main/java/org/oran/dmaapadapter/repository/Jobs.java
src/main/java/org/oran/dmaapadapter/tasks/DmaapTopicListener.java
src/main/java/org/oran/dmaapadapter/tasks/HttpJobDataDistributor.java [moved from src/main/java/org/oran/dmaapadapter/tasks/HttpDataConsumer.java with 86% similarity]
src/main/java/org/oran/dmaapadapter/tasks/JobDataDistributor.java [moved from src/main/java/org/oran/dmaapadapter/tasks/DataConsumer.java with 78% similarity]
src/main/java/org/oran/dmaapadapter/tasks/KafkaJobDataDistributor.java [moved from src/main/java/org/oran/dmaapadapter/tasks/KafkaDataConsumer.java with 87% similarity]
src/main/java/org/oran/dmaapadapter/tasks/KafkaTopicListener.java
src/main/java/org/oran/dmaapadapter/tasks/ProducerRegstrationTask.java
src/main/java/org/oran/dmaapadapter/tasks/TopicListener.java
src/main/java/org/oran/dmaapadapter/tasks/TopicListeners.java
src/main/resources/typeSchemaPmData.json
src/test/java/org/oran/dmaapadapter/ApplicationTest.java
src/test/java/org/oran/dmaapadapter/IcsSimulatorController.java
src/test/java/org/oran/dmaapadapter/IntegrationWithIcs.java
src/test/java/org/oran/dmaapadapter/IntegrationWithKafka.java
src/test/java/org/oran/dmaapadapter/filter/JsltFilterTest.java [moved from src/test/java/org/oran/dmaapadapter/repository/filters/JsltFilterTest.java with 87% similarity]
src/test/java/org/oran/dmaapadapter/filter/JsonPathFilterTest.java [moved from src/test/java/org/oran/dmaapadapter/repository/filters/JsonPathFilterTest.java with 89% similarity]
src/test/java/org/oran/dmaapadapter/filter/PmReportFilterTest.java [moved from src/test/java/org/oran/dmaapadapter/repository/filters/PmReportFilterTest.java with 67% similarity]
src/test/resources/test_application_configuration.json