From 3e263ba2fd49d84cea5da0ac001419370ff29d4e Mon Sep 17 00:00:00 2001
From: t-muskans <t-muskans@microsoft.com>
Date: Tue, 1 Jun 2021 14:54:52 +0530
Subject: [PATCH] updated NOTICE
---
NOTICE | 6 +++++-
.../osdu/indexer/azure/service/RetryPolicyTest.java | 12 ++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/NOTICE b/NOTICE
index 4c408c6e6..f26b38d79 100644
--- a/NOTICE
+++ b/NOTICE
@@ -382,10 +382,10 @@ The following software have components provided under the terms of this license:
- Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Netty HTTP Client Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
+- Mockito (from http://www.mockito.org)
- Mockito (from http://mockito.org)
- Mockito (from http://mockito.org)
- Mockito (from http://mockito.org)
-- Mockito (from http://www.mockito.org)
- Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/)
- MongoDB Driver (from http://www.mongodb.org)
- MongoDB Java Driver Core (from http://www.mongodb.org)
@@ -487,6 +487,8 @@ The following software have components provided under the terms of this license:
- StAX (from http://stax.codehaus.org/)
- StAX API (from http://stax.codehaus.org/)
- T-Digest (from https://github.com/tdunning/t-digest)
+- Vavr (from http://vavr.io)
+- Vavr Match (from http://vavr.io)
- Woodstox (from https://github.com/FasterXML/woodstox)
- Xerces2-j (from https://xerces.apache.org/xerces2-j/)
- aalto-xml (from )
@@ -561,6 +563,8 @@ The following software have components provided under the terms of this license:
- proton-j (from )
- rank-eval (from https://github.com/elastic/elasticsearch)
- rank-eval (from https://github.com/elastic/elasticsearch)
+- resilience4j (from https://github.com/resilience4j/resilience4j)
+- resilience4j (from https://github.com/resilience4j/resilience4j)
- rest (from https://github.com/elastic/elasticsearch)
- rest (from https://github.com/elastic/elasticsearch)
- rest-high-level (from https://github.com/elastic/elasticsearch)
diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/RetryPolicyTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/RetryPolicyTest.java
index 65d48565c..da0e03240 100644
--- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/RetryPolicyTest.java
+++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/RetryPolicyTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
@RunWith(MockitoJUnitRunner.class)
public class RetryPolicyTest {
- private static final String JSON1 = "{\n" +
+ private static final String JSON_RESPONSE_WITH_NOT_FOUND = "{\n" +
" \"records\": [\n" +
" {\n" +
" \"data\": {\n" +
@@ -73,7 +73,7 @@ public class RetryPolicyTest {
" \"conversionStatuses\": []\n" +
"}";
- private static final String JSON2 = "{\n" +
+ private static final String JSON_RESPONSE1_WITHOUT_NOT_FOUND = "{\n" +
" \"records\": [\n" +
" {\n" +
" \"data\": {\n" +
@@ -111,7 +111,7 @@ public class RetryPolicyTest {
" \"conversionStatuses\": []\n" +
"}";
- private static final String JSON3 = "{\n" +
+ private static final String JSON_RESPONSE2_WITHOUT_NOT_FOUND = "{\n" +
" \"records\" :[],\n" +
" \"conversionStatuses\":[]\n" +
"}";
@@ -130,7 +130,7 @@ public class RetryPolicyTest {
public void retry_should_be_true_for_json1() {
RetryConfig config = this.retryPolicy.retryConfig();
Predicate<HttpResponse> retry = config.getResultPredicate();
- response.setBody(JSON1);
+ response.setBody(JSON_RESPONSE_WITH_NOT_FOUND);
assert retry != null;
boolean value = retry.test(response);
@@ -141,7 +141,7 @@ public class RetryPolicyTest {
public void retry_should_be_false_for_json2() {
RetryConfig config = this.retryPolicy.retryConfig();
Predicate<HttpResponse> retry = config.getResultPredicate();
- response.setBody(JSON2);
+ response.setBody(JSON_RESPONSE1_WITHOUT_NOT_FOUND);
boolean value = retry.test(response);
assertFalse(value);
@@ -151,7 +151,7 @@ public class RetryPolicyTest {
public void retry_should_be_false_for_json3() {
RetryConfig config = this.retryPolicy.retryConfig();
Predicate<HttpResponse> retry = config.getResultPredicate();
- response.setBody(JSON3);
+ response.setBody(JSON_RESPONSE2_WITHOUT_NOT_FOUND);
boolean value = retry.test(response);
assertFalse(value);
--
GitLab