From 8a29bfd8017d46757ef48eb7332d71000768880a Mon Sep 17 00:00:00 2001
From: Larissa Pereira <LPereira14@slb.com>
Date: Thu, 22 Apr 2021 15:32:57 -0500
Subject: [PATCH] resolving namespace conflict with gcp
---
.../indexer/util/{IndexFilter.java => IndexerFilter.java} | 4 ++--
.../util/{IndexFilterTest.java => IndexerFilterTest.java} | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
rename indexer-core/src/main/java/org/opengroup/osdu/indexer/util/{IndexFilter.java => IndexerFilter.java} (93%)
rename indexer-core/src/test/java/org/opengroup/osdu/indexer/util/{IndexFilterTest.java => IndexerFilterTest.java} (86%)
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexFilter.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerFilter.java
similarity index 93%
rename from indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexFilter.java
rename to indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerFilter.java
index 0acdc656c..633179c42 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexFilter.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/util/IndexerFilter.java
@@ -16,12 +16,12 @@ import org.springframework.stereotype.Component;
@Log
@Component
-public class IndexFilter implements Filter {
+public class IndexerFilter implements Filter {
private final DpsHeaders dpsHeaders;
@Autowired
- public IndexFilter(DpsHeaders dpsHeaders) {
+ public IndexerFilter(DpsHeaders dpsHeaders) {
this.dpsHeaders = dpsHeaders;
}
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexFilterTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexerFilterTest.java
similarity index 86%
rename from indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexFilterTest.java
rename to indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexerFilterTest.java
index d404aa9dd..9d7360967 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexFilterTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/util/IndexerFilterTest.java
@@ -15,13 +15,13 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.Collections;
@RunWith(MockitoJUnitRunner.class)
-public class IndexFilterTest {
+public class IndexerFilterTest {
+
@InjectMocks
- private IndexFilter indexFilter;
+ private IndexerFilter indexerFilter;
@Mock
private DpsHeaders dpsHeaders;
@@ -34,7 +34,7 @@ public class IndexFilterTest {
Mockito.when(dpsHeaders.getCorrelationId()).thenReturn("correlation-id-value");
- indexFilter.doFilter(httpServletRequest, httpServletResponse, filterChain);
+ indexerFilter.doFilter(httpServletRequest, httpServletResponse, filterChain);
Mockito.verify(httpServletResponse).addHeader("correlation-id", "correlation-id-value");
Mockito.verify(filterChain).doFilter(httpServletRequest, httpServletResponse);
--
GitLab