diff --git a/data-prepper-plugins/saas-source-plugins/atlassian-commons/build.gradle b/data-prepper-plugins/saas-source-plugins/atlassian-commons/build.gradle index e8c2183214..fac3cd245b 100644 --- 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/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/rest/CustomRestTemplateConfigTest.java b/data-prepper-plugins/saas-source-plugins/atlassian-commons/src/test/java/org/opensearch/dataprepper/plugins/source/atlassian/rest/CustomRestTemplateConfigTest.java similarity index 83% rename from data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/rest/CustomRestTemplateConfigTest.java rename to data-prepper-plugins/saas-source-plugins/atlassian-commons/src/test/java/org/opensearch/dataprepper/plugins/source/atlassian/rest/CustomRestTemplateConfigTest.java index ea20598dff..0e52d16eb6 100644 --- a/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/rest/CustomRestTemplateConfigTest.java +++ b/data-prepper-plugins/saas-source-plugins/atlassian-commons/src/test/java/org/opensearch/dataprepper/plugins/source/atlassian/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,8 +36,6 @@ 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 { @@ -47,7 +43,7 @@ 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 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 index cd1cee26e8..07308a50f7 100644 --- 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/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java b/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java index 5893e7065d..6e36bf3c1e 100644 --- a/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java +++ b/data-prepper-plugins/saas-source-plugins/confluence-source/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); } /**