Commit 60cce37a authored 1 year ago by Marc Burnie [AWS]

resolving merge conflicts

parents 67ce911b 96df4fc2

No related branches found

No related tags found

1 merge request!536M18 service and CICD updates

Expand all Hide whitespace changes

Inline Side-by-side

Showing

NOTICE 3 additions, 2 deletions

NOTICE
indexer-core/pom.xml 2 additions, 2 deletions

indexer-core/pom.xml
indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IMappingService.java 0 additions, 3 deletions

...a/org/opengroup/osdu/indexer/service/IMappingService.java
indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImpl.java 0 additions, 215 deletions

.../opengroup/osdu/indexer/service/IndexCopyServiceImpl.java
indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java 6 additions, 122 deletions

...group/osdu/indexer/service/IndexerMappingServiceImpl.java
indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java 3 additions, 3 deletions

...rg/opengroup/osdu/indexer/service/IndexerServiceImpl.java
indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageService.java 2 additions, 1 deletion

...va/org/opengroup/osdu/indexer/service/StorageService.java
indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java 81 additions, 21 deletions

...rg/opengroup/osdu/indexer/service/StorageServiceImpl.java
indexer-core/src/test/java/org/opengroup/osdu/indexer/service/IndexerServiceImplTest.java 1 addition, 1 deletion

...pengroup/osdu/indexer/service/IndexerServiceImplTest.java
indexer-core/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceImplTest.java 266 additions, 7 deletions

...pengroup/osdu/indexer/service/StorageServiceImplTest.java
pom.xml 1 addition, 1 deletion

pom.xml
provider/indexer-aws/pom.xml 3 additions, 3 deletions

provider/indexer-aws/pom.xml
provider/indexer-azure/pom.xml 3 additions, 3 deletions

provider/indexer-azure/pom.xml
provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/PublisherConfig.java 11 additions, 10 deletions

.../org/opengroup/osdu/indexer/azure/di/PublisherConfig.java
provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/IndexerQueueTaskBuilderAzure.java 22 additions, 14 deletions

...osdu/indexer/azure/util/IndexerQueueTaskBuilderAzure.java
provider/indexer-azure/src/main/resources/application.properties 1 addition, 1 deletion

...r/indexer-azure/src/main/resources/application.properties
provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexCopyServiceImplTest.java 0 additions, 191 deletions

.../osdu/indexer/azure/service/IndexCopyServiceImplTest.java
provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerMappingServiceTest.java 90 additions, 273 deletions

...osdu/indexer/azure/service/IndexerMappingServiceTest.java
provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java 0 additions, 246 deletions

...ngroup/osdu/indexer/azure/service/StorageServiceTest.java
provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/util/IndexerQueueTaskBuilderAzureTest.java 57 additions, 30 deletions

.../indexer/azure/util/IndexerQueueTaskBuilderAzureTest.java

with 552 additions and 1149 deletions

Please register or to comment