summaryrefslogtreecommitdiffstats
path: root/aai-core/src
AgeCommit message (Collapse)AuthorFilesLines
2024-10-09Refactor DeltaEventsFiete Ostkamp22-1328/+188
- get rid of StoreNotificationEvent class and directly publish to Kafka - use Lombok in related classes Issue-ID: AAI-4014 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: Ic6433b75a4540f597edf1316afe6d6c56a7bd08b
2024-10-09Assign variables in HttpEntry closer to where they are usedFiete Ostkamp1-37/+25
- HttpEntry should be broken into smaller chunks that are more maintainable Issue-ID: AAI-3660 Change-Id: I1f0fe2307c837f7de9e26eb02d9e5d5ef44927df Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-10-09Merge "Refactor UEBNotification class"Nandkishor Patke25-777/+549
2024-10-09Refactor UEBNotification classFiete Ostkamp25-777/+549
- refactor UEBNotification class that it does not use ActiveMQ anymore and directly publishes to Kafka - use .domain.NotificationEvent class - serialize as late as possible Issue-ID: AAI-3931 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I3836519752f810f905a9aed96678d497783a2e5d
2024-10-07Update Janusgraph to 1.0.0Fiete Ostkamp5-24/+20
- update Janusgraph (0.6.4 -> 1.0.0) - update Tinkerpop (3.5.8 -> 3.7.1) Issue-ID: AAI-3743 Change-Id: I5f2f929645b8f327bc90eabab6c06a6b80bdbc3e Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-10-05Make Introspector serializable via JacksonFiete Ostkamp2-0/+66
- annotate Introspector, such that ObjectMapper can serialize it Issue-ID: AAI-4010 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I4896f811fa9db0637c941a11b01f26b734b15a21
2024-10-02Extract entity conversion logic into separate classFiete Ostkamp4-48/+194
Issue-ID: AAI-4008 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: Ic00d989ba97dd9e23d028d9e262ea2967d889e79
2024-09-22Remove aai-aaf-auth from aai-commonFiete Ostkamp1-40/+0
- AAF has been removed from ONAP some time ago, thus this model is not needed anymore Issue-ID: AAI-4006 Change-Id: I7943ed2f4c5308cca058c8aead9b0bd3b95ac580 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-09-21Migrate JAXB to jakartaFiete Ostkamp10-14/+14
- change javax.* JAXB packages to jakarta.* - bump snapshot version to 1.15.0-SNAPSHOT Issue-ID: AAI-4005 Change-Id: I2a208f717206a2ee8c2acaec8abb0a04fc620123 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-09-17Migrate remnants of jersey 1 to 2 in aai-commonFiete Ostkamp3-151/+151
- use org.glassfish.jersey instead of com.sun.jersey Issue-ID: AAI-3990 Change-Id: Ice5731a241be3adf03a64a66fe6f595e5970c7c0 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-09-06AAI events are not being publishedFiete Ostkamp3-21/+156
- create e2e test case for notification sending - fix notification sending - disable tests since they can only be active with some larger refactoring Issue-ID: AAI-3988 Change-Id: I498b3b02218d81821dd17c3d8ad0da4de859924b Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-08-19Update spring-boot to 2.5 in aai-commonFiete Ostkamp2-13/+7
- update spring-boot (2.4 -> 2.5.15) - update vulnerable dependencies (spring-jms) - remove old codehaus.jackson dependency Issue-ID: AAI-3972 Change-Id: Ie0854c192a3a7bb719e9ac0e080e83a48e1b964a Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-08-05Add test for transaction rollback in HttpEntryFiete Ostkamp33-63/+189
- verify that transaction is rolled back when writing a request in a batch fails - remove all unused imports Issue-ID: AAI-3942 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I93cd1efa08db533a088e242694f07ff10db36b4e
2024-08-01Add tests for the NotificationServiceFiete Ostkamp7-83/+375
- change approach how ValidationService is injected into NotificationService - add tests for NotificationService - assert invokation of NotificationService instead of ValidationService in HttpEntryTest now Issue-ID: AAI-3940 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I4476857f7192f53de216f0515f0e69c642c33d1c
2024-07-23Make JMS-based messaging compatible with tracingFiete Ostkamp12-420/+555
- use dependency injection instead of new Foo() for jms related classes - inject interfaces and not their implementations - add integration test that asserts message sending via JMS to Kafka [1] [1] this also prepares removal of ActiveMQ as a middleman Issue-ID: AAI-3932 Change-Id: Icbdd264f5b52adc72aa05046ed66d9bd5108c372 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-07-20Extract HttpEntry notification logic into a separate NotificationServiceFiete Ostkamp19-271/+235
- introduce NotificationService - rename ueb package to notification - remove meaningless javadocs Issue-ID: AAI-3930 Change-Id: Ic6ffd5511235d2400b0d6db71f7d7aa13d2b076b Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-07-08Update Janusgraph to 0.6.0 in aai-commonFiete Ostkamp4-1072/+1077
- update Tinkerpop (3.4.13 -> 3.5.0) + Janusgraph (0.5.0 -> 0.6.0) - bump version to 1.14.4-SNAPSHOT Issue-ID: AAI-3914 Change-Id: I4beeb2db6f2ba4b9ee25b084bb42dd551cda1375 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-07-03Pagination will throw an IllegalArgumentException if there are no vertices ↵Fiete Ostkamp2-2033/+2059
of the requested type - provide empty PaginationResponse when traversal.next() throws IllegalArgumentException Issue-ID: AAI-3917 Change-Id: I280f216050ea16953015023146d40674e067f028 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-06-28Update Janusgraph to 0.5.0 in aai-commonFiete Ostkamp2-187/+15
- update tinkerpop to 3.4.13 - update janusgraph to 0.5.0 - restore the total-pages header that was accidentally removed in the last pagination commit - remove stateful pagination logic from HttpEntry Issue-ID: AAI-3900 Change-Id: I5fac397ece75136673b8dc3866e10ff15dfdcee3 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-06-26Add gremlin-based pagination to aai-commonFiete Ostkamp11-84/+542
- enhance query building to support gremlin-based pagination - pagination is supported in two variants: with and without the total count of elements [1] - enhance query building to support gremlin-based sorting - add query logging that is currently disabled [1] due to the design of gremlin, including the total count results in a full graph scan. As such there is the option to not include it, which should make it (much) faster for the first pages that are returned. Issue-ID: AAI-3893 Change-Id: I6bc0c9b9f398556cc41a0a8f82e24e50c85e5690 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-06-17Bump aai-common version to 1.14.1Fiete Ostkamp1-1/+1
Issue-ID: AAI-3883 Change-Id: If89ec7af4b54462852c5578597112eb371b0c2f6 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-06-15Update tinkerpop to 3.3.11 in aai-commonFiete Ostkamp1-0/+5
Issue-ID: AAI-3875 Change-Id: Iba69b1d4850fcd86dc0ee9cd209c74396e2e8f4a Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-06-04Merge "Update janusgraph to 0.3.3"Fiete Ostkamp9-20/+42
2024-06-04Update janusgraph to 0.3.3Fiete Ostkamp9-20/+42
- update tinkerpop version from 3.2.11 to 3.3.0 - update janusgraph from 0.2.3 to 0.3.3 - the default GraphSON version would change with this update but was held back [1] - add jackson-dataformat-xml dependency to aai-core as the XmlMapper is used in the ErrorLogHelper [1] a separate story AAI-3796 - Use GraphSON v2 or v3 in AAI has been created for this Issue-ID: AAI-3795 Change-Id: I4539e83aa74c260d5238ebe869e9884d4396e9f4 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-05-29Refactor the ValidationServiceFiete Ostkamp3-86/+103
- slightly refactor the code - assert it's invocation in the HttpEntryTest Issue-ID: AAI-3864 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: If8d218f5c6467956e25fd1c4deb588f3fb5c7d2c
2024-05-28Refactor HttpEntry class - Part 1Fiete Ostkamp3-60/+54
- simplify setHttpEntryProperties (later on this will likely be done in the constructor) - move some logic of UEBNotification into separate methods - resolve jsonassert dependency conflict Issue-ID: AAI-3863 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: Ic84b43156890352509dc9c547478abdf53e96d6a
2024-04-10Remove DMaaP dependency from AAI-CommonSingh15-411/+572
- Remove Dmaap dependency in AAI-Common and replace it with Kafka. Issue-ID: AAI-3792 Change-Id: If3fd5c3bdc2448f7e260a26000b02a510c80d7fb Signed-off-by: Singh <soumya.e.singh@accenture.com>
2024-02-26Only load SchemaService related beans in aai-common when ↵Fiete Ostkamp2-9/+2
schema.translator.list=schema-service - conditionally load schema-service related config, otherwise use the ConfigTranslator - this prepares locally running traversal via mvn spring-boot:run Issue-ID: AAI-3787 Change-Id: I9415802fb708933e8596b62e7540fa8a156e4cd6 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-02-21Enhance SchemaGenerator to also generate indices for relationshipsFiete Ostkamp4-115/+358
- generate edge indexes when they not already exist - reindex existing indexes when they are not in status ENABLED - try to recover indexes that are in INSTALLED state - bump version to 1.13.5 Issue-ID: AAI-3782 Change-Id: I127e0f83b17485d7a6721206ade92cd50c89a51b Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-02-05Pivoting a TraversalURIOptimisedQuery is broken in release 1.13.2Fiete Ostkamp4-43/+179
- fix query building for TraversalURIOptimizedQuery - enable DataLinkTests for TRAVERSAL_URI again - add further tests to test pivoting more directly - roll back version to 1.13.2 to rerelease fixed version - add python six dependency to fix upstream issue with sphinxcontrib-swagger dependency Issue-ID: AAI-3758 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I3e54216e00d0491d64265e149f55cf8aba6fabd9
2024-01-25Update tinkerpop to 3.2.4Fiete Ostkamp10-37/+355
- work around hasStep inlining - add tests that more directly assert traversal state - add TinkerpopUpgradeTests test suite [1] - bump aai-common version to 1.13.2 [1] this allows to run the tests that are likely affected by a tinkerpop upgrade Issue-ID: AAI-3740 Change-Id: I86fb9b0c86802c7c0f74a5aae0976e81bf501eb0 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-01-22Merge "Revert "Update tinkerpop to 3.2.3 in aai-core""Nandkishor Patke4-178/+104
2024-01-20Update tinkerpop to 3.2.3 in aai-coreFiete Ostkamp1-4/+8
- no not apply the InlineFilterStrategy optimisation [1] [1] the strategy aggregates consecutive has-steps into one has([...]). This messes with the container and parent query step indices that are saved while building the query. Issue-ID: AAI-3554 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I5b63ce16b8020633ea059fed7f70577661758415
2024-01-20Revert "Update tinkerpop to 3.2.3 in aai-core"Fiete Ostkamp4-178/+104
This reverts commit 4e7ca21da096ff03ca70451fb5e7b95d3fd18f6e. Reason for revert: This is not properly fixing the underlying issue and was merged prematurely Issue-ID: AAI-3554 Change-Id: I3ff720bd5322712bdde13d774cc4366a9ed28650 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-01-20Merge "Update tinkerpop to 3.2.3 in aai-core"Nandkishor Patke4-104/+178
2024-01-19Update tinkerpop to 3.2.3 in aai-coreFiete Ostkamp4-104/+178
- eagerly clone queries as they are optimised at a later stage when called lazily Issue-ID: AAI-3554 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I18e97635d61e8cb08981cfea0143994f1572b39e
2024-01-15Ensure HttpEntry bean is request scoped in aai-commonFiete Ostkamp1-2/+26
- declare separate request scoped HttpEntry beans - leave the existing prototype scoped HttpEntry beans in place [1] - disable flaky test [1] some of the existing tests (in traversal+resources) use them in a non-web context In those cases, using request scoped beans requires extra annotations to make it work Issue-ID: AAI-3723 Change-Id: I1295fe8d18f3364472f4230f28ea6ef936c5f42b Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-01-11Update spring boot to 2.4Fiete Ostkamp14-14/+14
- update spring boot from 2.3 to 2.4 - remove compile-time dependency on powermock introduced by eelf-core - remove dependencyManagement declarations for powermock since it's not used anymore Issue-ID: AAI-3725 Change-Id: I05a35e0cee80b27123f28bb8eeb8ed885c83a173 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-01-10Update spring boot to 2.3Fiete Ostkamp2-4/+4
- update to 2.3 - bump version of all submodules to 1.13.1-SNAPSHOT Issue-ID: AAI-3724 Change-Id: Id089e27b236476907c4e7ca7e51d72b74d387d1c Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-01-10Merge "Update spring boot to 2.2"Lukasz Rajewski1-1/+1
2024-01-10Ensure HttpEntry bean is request scoped in aai-commonFiete Ostkamp2-4/+6
- change beans to request scoped since the transaction handling inside it is not thread-safe - bean injection in jersey is "request" scoped by default, but in a spring web context it is "prototype" - in the prototype scope, multiple threads could access the same HttpEntry Issue-ID: AAI-3723 Change-Id: I083e3b06cdbe4491f22746033cdcc80aa48a2d1b Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2024-01-10Update spring boot to 2.2Fiete Ostkamp1-1/+1
- update spring dependency to 2.2.13 - remove profile based switch between spring versions 1.5.22 and 2.1.12 - migrate testng based tests in aai-els-onap-logging to junit 4 - rely more on boms for dependencyManagement by removing separate declarations (of spring and jackson) - resolve some build warnings by adding dependency + plugin versions - resolve some build warnings by removing duplicate declarations of dependencies - resolve build warning about ambiguous reference to JsonObject.addProperty() Issue-ID: AAI-3711 Change-Id: I7559e90ffb65199ee46bc5b7cdf5d9e73b7d87bc Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2023-12-22Refactor ErrorLogHelperFiete Ostkamp2-123/+0
- change is designed to not make any changes to the serialised objects [1] - introduce common error response object that is used for both service and policy, xml + json format - separate creation of error response and the marshalling of it - increase test coverage - use jackson object mappers for marshalling json and xml objects instead of custom MapperUtil - make code more functional - use more descriptive variable names [1] only the internal representation changes to account for both Service- and PolicyException Issue-ID: AAI-3695 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I1e82bf4f0706704679d14aac98969fa00beed758
2023-08-16Merge "Refactor HttpEntryTest"Lukasz Rajewski8-446/+812
2023-08-16Refactor HttpEntryTestFiete Ostkamp8-446/+812
- make test cases independently runnable by removing shared state - let method naming better reflect what is being tested - assign commonly used objects on the class level when they are not modified in the test case - parse error response object and assert error messages Other: - remove unnecessary saving in map in EdgeSerializer Issue-ID: AAI-3658 Change-Id: I3b9704b8a6b6cfa6ecf4930dc3b1d1a7ce84764a Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
2023-08-11Refactor DBSerializer verifyResourceVersion methodFiete Ostkamp2-76/+91
- assign variables closer to where they are used - have a less complex validation logic - rename related test cases to better understand what they are doing - add further test cases (this would actually be better covered via a parameterized test) - rename DBSerializer variable in test cases to better match whith the name of the type it's representing Issue-ID: AAI-3657 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: Id7976b0123c17178845db115c09b5c00d2361e6d
2023-08-08Make URIParser code more readable - Part 2Fiete Ostkamp2-50/+41
- declare variables closer to where they are used - move more validation into the validatePath method - increment the global index variable i in fewer places Issue-ID: AAI-3656 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I64380b84370a362113bf64c4edff3d389ffb290e
2023-08-04Make URIParser code more readableFiete Ostkamp2-90/+110
Issue-ID: AAI-3655 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I26350e7279287c711f38194dbc1e8d302cf9a26d
2022-11-11Merge "Partially resolve resource leak warnings in aai-common"William Reehil3-77/+80
2022-11-11Merge "Reduce the number of raw-type related warnings in aai-common"William Reehil19-38/+74