moved the test to the atlassian commons

Signed-off-by: Santhosh Gandhe <[email protected]>
opensearch-project · Feb 4, 2025 · 6bd3451 · 6bd3451
1 parent 4fde3e9
commit 6bd3451
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/data-prepper-plugins/saas-source-plugins/atlassian-commons/build.gradle b/data-prepper-plugins/saas-source-plugins/atlassian-commons/build.gradle
@@ -7,6 +7,7 @@ dependencies {
 
     implementation project(path: ':data-prepper-api')
     implementation project(path: ':data-prepper-plugins:saas-source-plugins:source-crawler')
+    implementation project(path: ':data-prepper-plugins:common')
 
     implementation 'com.fasterxml.jackson.core:jackson-core'
     implementation 'com.fasterxml.jackson.core:jackson-databind'

diff --git a/...ce/rest/CustomRestTemplateConfigTest.java → ...an/rest/CustomRestTemplateConfigTest.java b/...ce/rest/CustomRestTemplateConfigTest.java → ...an/rest/CustomRestTemplateConfigTest.java
@@ -8,7 +8,7 @@
  *
  */
 
-package org.opensearch.dataprepper.plugins.source.confluence.rest;
+package org.opensearch.dataprepper.plugins.source.atlassian.rest;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -18,14 +18,12 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.dataprepper.model.plugin.PluginConfigVariable;
+import org.opensearch.dataprepper.plugins.source.atlassian.AtlassianSourceConfig;
 import org.opensearch.dataprepper.plugins.source.atlassian.configuration.AuthenticationConfig;
 import org.opensearch.dataprepper.plugins.source.atlassian.configuration.BasicConfig;
 import org.opensearch.dataprepper.plugins.source.atlassian.configuration.Oauth2Config;
-import org.opensearch.dataprepper.plugins.source.atlassian.rest.BasicAuthInterceptor;
-import org.opensearch.dataprepper.plugins.source.atlassian.rest.CustomRestTemplateConfig;
-import org.opensearch.dataprepper.plugins.source.atlassian.rest.OAuth2RequestInterceptor;
 import org.opensearch.dataprepper.plugins.source.atlassian.rest.auth.AtlassianAuthConfig;
-import org.opensearch.dataprepper.plugins.source.confluence.ConfluenceSourceConfig;
+import org.opensearch.dataprepper.plugins.source.atlassian.utils.Constants;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.InterceptingClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
@@ -38,16 +36,14 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
-import static org.opensearch.dataprepper.plugins.source.confluence.utils.Constants.BASIC;
-import static org.opensearch.dataprepper.plugins.source.confluence.utils.Constants.OAUTH2;
 
 @ExtendWith(MockitoExtension.class)
 class CustomRestTemplateConfigTest {
 
     private CustomRestTemplateConfig config;
 
     @Mock
-    private ConfluenceSourceConfig mockSourceConfig;
+    private AtlassianSourceConfig mockSourceConfig;
 
     @Mock
     private AtlassianAuthConfig mockAuthConfig;
@@ -69,8 +65,8 @@ class CustomRestTemplateConfigTest {
 
     private static Stream<Arguments> provideAuthTypeAndExpectedInterceptorType() {
         return Stream.of(
-                Arguments.of(OAUTH2, OAuth2RequestInterceptor.class),
-                Arguments.of(BASIC, BasicAuthInterceptor.class),
+                Arguments.of(Constants.OAUTH2, OAuth2RequestInterceptor.class),
+                Arguments.of(Constants.BASIC, BasicAuthInterceptor.class),
                 Arguments.of("Default", BasicAuthInterceptor.class),
                 Arguments.of(null, BasicAuthInterceptor.class)
         );

diff --git a/data-prepper-plugins/saas-source-plugins/confluence-source/build.gradle b/data-prepper-plugins/saas-source-plugins/confluence-source/build.gradle
@@ -23,7 +23,6 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok:1.18.30'
 
     testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.4'
-    testImplementation project(path: ':data-prepper-plugins:saas-source-plugins:atlassian-commons')
     testImplementation project(path: ':data-prepper-test-common')
 
     implementation(libs.spring.context) {

diff --git a/...src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java b/...src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java
@@ -108,7 +108,7 @@ private void searchForNewContentAndAddToQueue(ConfluenceSourceConfig configurati
             addItemsToQueue(contentList, itemInfoQueue);
         } while (startAt < total);
         searchResultsFoundCounter.increment(total);
-        log.info("Number of tickets found in search api call: {}", total);
+        log.info("Number of content items found in search api call: {}", total);
     }
 
     /**