diff --git a/NOTICE b/NOTICE index 53ced5dcb12df78a0e1704aea6f94efec4bbd200..c8624866bcf518d9222cfa2d0fa6621d9e56ad60 100644 --- a/NOTICE +++ b/NOTICE @@ -448,8 +448,8 @@ The following software have components provided under the terms of this license: - Lucene Grouping (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping) - Lucene Highlighter (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter) - Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join) -- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory) - Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs) +- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory) - Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc) - Lucene Queries (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries) - Lucene QueryParsers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser) @@ -552,7 +552,6 @@ The following software have components provided under the terms of this license: - Spring AMQP Core (from https://projects.spring.io/spring-amqp) - Spring AOP (from https://github.com/spring-projects/spring-framework) - Spring Beans (from https://github.com/spring-projects/spring-framework) -- Spring Boot Log4j 2 Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-log4j2) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) - Spring Context (from https://github.com/spring-projects/spring-framework) - Spring Core (from https://github.com/spring-projects/spring-framework) @@ -707,6 +706,7 @@ The following software have components provided under the terms of this license: - spring-boot-starter-data-mongodb (from https://spring.io/projects/spring-boot) - spring-boot-starter-jersey (from https://spring.io/projects/spring-boot) - spring-boot-starter-json (from https://spring.io/projects/spring-boot) +- spring-boot-starter-log4j2 (from https://spring.io/projects/spring-boot) - spring-boot-starter-logging (from https://spring.io/projects/spring-boot) - spring-boot-starter-reactor-netty (from https://spring.io/projects/spring-boot) - spring-boot-starter-security (from https://spring.io/projects/spring-boot) @@ -739,7 +739,7 @@ The following software have components provided under the terms of this license: - tomcat-annotations-api (from https://tomcat.apache.org/) - tomcat-embed-core (from http://tomcat.apache.org/) - tomcat-embed-el (from https://tomcat.apache.org/) -- tomcat-embed-websocket (from http://tomcat.apache.org/) +- tomcat-embed-websocket (from https://tomcat.apache.org/) - xml-apis (from ) ======================================================================== @@ -758,7 +758,7 @@ The following software have components provided under the terms of this license: - Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common) - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core) - Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) -- Reflections (from http://code.google.com/p/reflections/) +- Reflections (from http://github.com/ronmamo/reflections) - Stax2 API (from http://github.com/FasterXML/stax2-api) - ThreeTen backport (from https://www.threeten.org/threetenbp) - jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation) @@ -800,7 +800,7 @@ The following software have components provided under the terms of this license: - Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java) - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) -- Reflections (from http://code.google.com/p/reflections/) +- Reflections (from http://github.com/ronmamo/reflections) - SnakeYAML (from http://www.snakeyaml.org) - Spring Core (from https://github.com/spring-projects/spring-framework) - ThreeTen backport (from https://www.threeten.org/threetenbp) @@ -1233,7 +1233,7 @@ WTFPL ======================================================================== The following software have components provided under the terms of this license: -- Reflections (from http://code.google.com/p/reflections/) +- Reflections (from http://github.com/ronmamo/reflections) ======================================================================== X11 diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/IndexerQueueTaskBuilderAzure.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/IndexerQueueTaskBuilderAzure.java index 947e060ba6171c9b96f0f47fe871e60f1d061e6d..914fba0a1ed1466be681f6be47e0f600a86e251f 100644 --- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/IndexerQueueTaskBuilderAzure.java +++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/IndexerQueueTaskBuilderAzure.java @@ -46,7 +46,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - @Log @Component @RequestScope @@ -69,6 +68,10 @@ public class IndexerQueueTaskBuilderAzure extends IndexerQueueTaskBuilder { @Inject private StorageService storageService; + @Override + public void createWorkerTask(String payload, DpsHeaders headers) { + createTask(payload, headers); + } @Override public void createWorkerTask(String payload, Long countdownMillis, DpsHeaders headers) { @@ -76,6 +79,12 @@ public class IndexerQueueTaskBuilderAzure extends IndexerQueueTaskBuilder { createTask(payload, headers); } + @Override + public void createReIndexTask(String payload, DpsHeaders headers) { + headers.addCorrelationIdIfMissing(); + publishAllRecordsToServiceBus(payload, headers); + } + @Override public void createReIndexTask(String payload, Long countdownMillis, DpsHeaders headers) { headers.addCorrelationIdIfMissing(); @@ -151,7 +160,7 @@ public class IndexerQueueTaskBuilderAzure extends IndexerQueueTaskBuilder { message.setContentType("application/json"); try { - logger.debug("Indexer publishes message to Service Bus " + headers.getCorrelationId()); + logger.info("Indexer publishes message to Service Bus " + headers.getCorrelationId()); topicClientFactory.getClient(headers.getPartitionId(), serviceBusReindexTopicName).send(message); } catch (Exception e) { logger.error(e.getMessage(), e);