summaryrefslogtreecommitdiffstats
path: root/aai-schema-ingest/src
AgeCommit message (Collapse)AuthorFilesLines
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-04Update janusgraph to 0.3.3Fiete Ostkamp1-0/+1
- 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-02-26Only load SchemaService related beans in aai-common when ↵Fiete Ostkamp6-33/+44
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-15Enable dependency injection for some aai-common classesFiete Ostkamp5-18/+21
- minor refactorings in SchemaServiceTranslator - annotate the other classes with @Component to make them available for dependency injection Issue-ID: AAI-3780 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: Ia48743b81de36e1da3e71eee8821baa526c86885
2024-01-22Merge "Revert "Update tinkerpop to 3.2.3 in aai-core""Nandkishor Patke1-1/+1
2024-01-20Revert "Update tinkerpop to 3.2.3 in aai-core"Fiete Ostkamp1-1/+1
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 Patke1-1/+1
2024-01-19Update tinkerpop to 3.2.3 in aai-coreFiete Ostkamp1-1/+1
- 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-10Update spring boot to 2.2Fiete Ostkamp2-18/+18
- 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 Ostkamp1-140/+34
- 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
2022-11-11Merge "Reduce the number of raw-type related warnings in aai-common"William Reehil2-7/+9
2022-11-10Replace deprecated methods in aai-commonFiete Ostkamp1-4/+1
Issue-ID: AAI-3589 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I9e32b879ee0d143a6b66e06d425bed7412139e58
2022-11-09Reduce the number of raw-type related warnings in aai-commonFiete Ostkamp2-7/+9
Issue-ID: AAI-3586 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: If4affb02cfe40b4b82ecbdbb1a25d919d88be25c
2022-11-07Reduce the number of problems in aai-common by removing unused importsFiete Ostkamp31-123/+84
- run mvn spotless:apply across aai-commmon to remove unused imports - run mvn formatter:format across aai-common Issue-ID: AAI-3583 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: I2dfeb395eafa2824ce8369bba3a18db3e1845522
2022-10-14Remove the apache commons-lang dependency in aai-commonFiete Ostkamp4-18/+26
Issue-ID: AAI-3551 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de> Change-Id: Ib68b6fb43044532abf39c1ac088ef969c5aa00c2
2021-07-02Fix all blocker sonar issues and some checkstyleLiard Samuel4-31/+48
Issue-ID: AAI-3362 Signed-off-by: sliard <samuel.liard@gmail.com> Change-Id: I365be3e8afe75b54f5a65deadb054df73857274e
2020-07-10Fix minor sonar issuesFrancis Toth2-49/+55
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Iea540bb663429d55ce90879f9d9a22888c583833 Issue-ID: AAI-2128
2020-05-12aai-common support for v20LaMont, William(wl2432)2-4/+25
Issue-ID: AAI-2904 Change-Id: I6dca2f785882b38ca2b2474a11affaa0328c003a Signed-off-by: LaMont, William(wl2432) <wl2432@att.com>
2020-04-21AAI-common sonar fixesDavid Brilla5-42/+32
Issue-ID: AAI-2786 Change-Id: Ia37e660886fce56c8ab5c53888fcbf265692a359 Signed-off-by: David Brilla <david.brilla@tieto.com>
2020-03-10Reenable spring-boot2 in aai-commonJimmy Forsyth4-5/+12
Issue-ID: AAI-2831 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I9f3f1d8d1d9ef45786d0f17afa5c824e90c77263
2020-03-10Move back to spring-boot 1.5 for bugfixJimmy Forsyth4-12/+5
Issue-ID: AAI-2831 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I1e3d278fe343e4f05cdfd71d2443aef19c8541c2
2020-03-03Update aai-common to be spring boot 2 compatibleHarish Venkata Kajur4-5/+12
Issue-ID: AAI-2806 Change-Id: Idad79373209ef25bb26551253aa8ad86e4a75549 Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
2020-02-25Enhancements for the aai-common libraryKajur, Harish (vk250x)20-141/+441
Issue-ID: AAI-2806 Change-Id: I2dbb46b897b35136ac1bb802978d3f974af1b307 Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
2020-02-14[AAI-2528] | Update to spring-boot 2.1.6.RELEASESneha Dantkale2-1/+3
Issue-ID: AAI-2528 Change-Id: I87756450c12538af3f21e4affa24ef76724d232c Signed-off-by: Sneha Dantkale <Sneha.dantkale@amdocs.com> Change-Id: I9437899ba1c7f2aec816a8076c954b080f9512fb Signed-off-by: Sneha Dantkale <Sneha.dantkale@amdocs.com> Change-Id: If3ad26f98c815e4872320b2652cf6c2e0b675de0 Signed-off-by: Sneha Dantkale <Sneha.dantkale@amdocs.com>
2019-09-04Change the two way ssl to one way sslKajur, Harish (vk250x)1-1/+1
Issue-ID: AAI-2432 Change-Id: Iad8da31cefb32ed88a74f712d8ff509a2a3e9b6a Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
2019-04-11AAI-1523 Batch reformat aai-schema-ingestKeong Lim96-2201/+2294
Use maven plugins from AAI-2198 to do batch reformat of aai-schema-ingest to consistent code style. Change-Id: I9ad7aa66edcada25fbeba7658ff8f258dab9ca93 Issue-ID: AAI-1523 Signed-off-by: Keong Lim <keong.lim@huawei.com>
2019-04-09Merge "Optimize the areas where its creating extra memory"James Forsyth3-28/+140
2019-04-08Update schema service to fail to startKajur, Harish (vk250x)29-96/+325
when all of the schema failed to load so the microservice wouldn't be in a bad state and also have the microservice dictate what versions of schema they are using Issue-ID: AAI-2329 Change-Id: Ie2e6e2bb3bac37b2ad57ada613e7c0e65647b64e Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
2019-04-07Optimize the areas where its creating extra memoryKajur, Harish (vk250x)3-28/+140
After doing some analysis using profiler found that the most cases where memory is being spent when doing an GET is during the conversion from one case to another case and instead cached that during the start of the application Issue-ID: AAI-2331 Change-Id: I291d5f953d4158daca293198cf6fc7f5cf86d25d Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
2019-01-13Sync up the changes for v15Kajur, Harish (vk250x)7-44/+107
Issue-ID: AAI-1811 Change-Id: I307731ee35d8a644ae995c4b372345a7ebeca0a1 Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com> Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
2018-12-05Update schema ingest library call schema serviceKajur, Harish (vk250x)96-1078/+9623
Issue-ID: AAI-1994 Change-Id: Icc9910db0371eeb8289abd4381ae1936a281a5df Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
2018-12-05Improve the performance of resoures microservice1.4.0Kajur, Harish (vk250x)6-155/+381
Currently the findSubGraph is being invoked and causing additional calls to the database by backing a tree backed vertex and slowing the performance of GET ALLs Original intention of both of them was to pre fetch depth 0, 1, and 2 at once so we don't have to get them at each depth but since that was not done right there is extra amount of time After the aai-uri migration to ensure all vertexes have the aai-uri and also to make sure they are unique across graph we don't need to traverse a vertex to find the parents to build aai-uri it was done previously when there was no aai-uri to derive the uri of a given vertex and its not necessary anymore so there would be performance improvements of vserver when there are a lot of relationships Currently the edge labels are retrieved for each vertex a and b and the performance of the GET with relationships will be propotional to the GET request and how many cousin edges it has and the more cousin edges there are the more slower the response time will be as for each cousin vertex its trying to get the edge in between so the code is modified to only go to the database for the edge label when there are multiple edge labels (cousin edges) between a and b If there are only one edge label and its a cousin vertex then we can use the edge rule to be able to figure out the edge label Improve PUT on the cloud region by modifying the getEdgesBetween method which currently was retrieving all the parent child edges between a and b and then only using the first edge The traversal itself was too complicated and was costly in terms of database retrieval and calls and optimized the code to utilize the edge information so we can modify the query to db at runtime based on the information provided so when a 10000 vservers under a tenant adding a new vserver under tenant would be slow because of the old query performance as it was taking some time there but with this optimization, its only spending at most a millisecond or 2 in that method Also noticed that when a PUT operation takes place, the method calls the related objects to create a dmaap event which was in turn calling the findParents and actually utilizing the parents to create the dmaap event and would spend quite a lot of time here because of the expensive call of the findParents in this case we need those vertexes So optimized the code so based on a given vertex, we have the aai-uri and the newly added metadata uriTemplate to break the aai-uri into its parent aai-uri and grand parent aai-uri and so forth With this breakdown, we can get the list of aai-uris which are parents, grandparents and then use the aai-uri to look them up which is O(1) lookup time due to the fact they are unique indexes The time it takes when doing a traversal to find the parents is propotional to the number of edges but this will be optimistic Another area which was improved was the json path execution of the edge rules so when the edge rules get loaded into memory it creates a document object, it utilizes the jsonpath to query information about the edge rules but the only thing here is each time it gets called the query gets invoked and uses jsonpath to retrieve the edge rules when we can cached them based on the filter so that the user executed and if the filter is the same as before, the expected edge rules will return the same Too much time was spent making the query and retrieving and building the edgerules So a cache is a perfect way to optimize this part Issue-ID: AAI-1987 Change-Id: Ieb8237de3fd31136ceac14bf4a8216a7ab3b7179 Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
2018-09-11AAI-1523 checkstyle warnings for aai-schema-ingestKeong Lim34-1169/+1169
Issue-ID: AAI-1523 re-indent code with spaces to clean up some checkstyle warnings for aai-schema-ingest (part of 24k lines of output) Change-Id: I1d3785fcbfa9cc53680129506daa2c392950de31 Signed-off-by: Keong Lim <keong.lim@huawei.com>
2018-09-06Sonar fixes in EdgeRuleQuery.javaasgar1-256/+261
Change-Id: I46029a19b3f495bebdf714b26c72739355dda8e8 Issue-ID: AAI-1559 Signed-off-by: Mohamed Asgar Samiulla <sammoham@in.ibm.com>
2018-08-12Integrate aai-schema-ingest library into aai-coreKajur, Harish (vk250x)88-571/+11527
Integrate the aai-core into using the aai-schema-ingest library to be agnostic to the schema changes Remove any references to aai-schema dependency in aai-core Reorder the components so the aai-schema-ingest is first installed Moved the edge rules to the aai-schema as they are linked to schema Rework the generation of the aai-schema to using aai-schema-ingest library Also remove the yaml and html folders as they get generated on the fly So when maven pushes the aai-schema jar, the jar contains the generated yaml, html and xsd files at runtime due to the gerrit limit of filesize Issue-ID: AAI-1455 Change-Id: I87ecd9eb2fc96a09d3a6399955637674f6e7fb21 Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
2018-06-29Refactor of EdgeIngestorWiktor Garbarek1-6/+0
Removed unusued imports Change-Id: I84984a566d339a1b366fa14eb387b21d94c14a34 Issue-ID: AAI-1347 Signed-off-by: Wiktor Garbarek <wiktor.garbarek@nokia.com>
2018-03-29added schema validation toolsThreefoot, Jane (jt6620)71-135/+3593
Issue-ID: AAI-879 Change-Id: I028547c97450372252b76286a8b10f4dbed4d2bf Signed-off-by: Threefoot, Jane (jt6620) <jt6620@att.com>
2018-03-22Merge "Update the license for 2017-2018 license"James Forsyth27-143/+67
2018-03-22Update the license for 2017-2018 licenseKajur, Harish (vk250x)27-143/+67
Issue-ID: AAI-856 Change-Id: I6711ff48314133abd7d03ea4b73a4f55606442bb Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
2018-03-15schemaIngest file no longer mandatory on classpathThreefoot, Jane (jt6620)1-1/+1
Fixed bug where users had to have schemaIngest.properties on the classpath even if they were using schemaIngestPropLoc instead. Issue-ID: AAI-887 Change-Id: Id8f15871f945d0a575203f7c3ce0679b6dbb2242 Signed-off-by: Threefoot, Jane (jt6620) <jt6620@att.com>
2018-03-15added new aai-schema-ingest libraryThreefoot, Jane (jt6620)42-0/+3252
New, lightweight, configurable library for OXM and edge rules json ingest. Allows for broken-up OXM and json for increased model-driven capabilities. Issue-ID: AAI-875 Change-Id: I987c7dc2ad9a68ef3ccaac8da8d3b5b0205dc264 Signed-off-by: Threefoot, Jane (jt6620) <jt6620@att.com>