Merge pull request #378 from catenax-ng/fix/Pool_Refactor_Remove_Open…

…Search feat(Pool): Remove Pool Mock for Opeansearch
eclipse-tractusx · Aug 9, 2023 · d676e6a · d676e6a
2 parents 1ad609a + 21c5746
commit d676e6a
Show file tree

Hide file tree

Showing 23 changed files with 14 additions and 305 deletions.
diff --git a/...-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/util/OpenSearchContextInitializer.kt b/...-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/util/OpenSearchContextInitializer.kt
@@ -66,7 +66,6 @@ class OpenSearchContextInitializer : ApplicationContextInitializer<ConfigurableA
             "bpdm.opensearch.host=${openSearchContainer.host}",
             "bpdm.opensearch.port=${openSearchContainer.getMappedPort(OPENSEARCH_PORT)}",
             "bpdm.opensearch.scheme=http",
-            "bpdm.opensearch.enabled=true",
         ).applyTo(applicationContext.environment)
     }
 }
diff --git a/bpdm-bridge-dummy/src/test/resources/application-test.properties b/bpdm-bridge-dummy/src/test/resources/application-test.properties
@@ -16,7 +16,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 ################################################################################
-bpdm.opensearch.enabled=false
 bpdm.opensearch.refresh-on-write=true
 bpdm.opensearch.alias=bpdm-opensearch
 bpdm.datasource.alias=bpdm-postgres

diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/Application.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/Application.kt
@@ -25,14 +25,7 @@ import org.springframework.boot.runApplication
 import org.springframework.scheduling.annotation.EnableScheduling
 
 
-@SpringBootApplication(
-    scanBasePackages = [
-        "org.eclipse.tractusx.bpdm.pool.config",
-        "org.eclipse.tractusx.bpdm.pool.controller",
-        "org.eclipse.tractusx.bpdm.pool.repository",
-        "org.eclipse.tractusx.bpdm.pool.service"
-    ]
-)
+@SpringBootApplication
 @ConfigurationPropertiesScan
 @EnableScheduling
 class Application

diff --git a/...n/kotlin/org/eclipse/tractusx/bpdm/pool/component/opensearch/mock/OpenSearchMockConfig.kt b/...n/kotlin/org/eclipse/tractusx/bpdm/pool/component/opensearch/mock/OpenSearchMockConfig.kt
diff --git a/...lin/org/eclipse/tractusx/bpdm/pool/component/opensearch/mock/service/SearchServiceMock.kt b/...lin/org/eclipse/tractusx/bpdm/pool/component/opensearch/mock/service/SearchServiceMock.kt
diff --git a/...-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/config/OpenSearchConfigProperties.kt b/...-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/config/OpenSearchConfigProperties.kt
@@ -24,7 +24,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties
 
 @ConfigurationProperties(prefix = "bpdm.opensearch")
 class OpenSearchConfigProperties(
-    val enabled: Boolean = false,
     val host: String = "localhost",
     val port: Int = 9200,
     val scheme: String = "http",

diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/config/OpenSearchEnabledConfig.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/config/OpenSearchEnabledConfig.kt
@@ -20,26 +20,10 @@
 package org.eclipse.tractusx.bpdm.pool.config
 
 import org.eclipse.tractusx.bpdm.pool.component.opensearch.impl.OpenSearchImplConfig
-import org.eclipse.tractusx.bpdm.pool.component.opensearch.mock.OpenSearchMockConfig
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
 
 
 @Configuration
 @Import(value = [OpenSearchImplConfig::class])
-@ConditionalOnProperty(
-    value = ["bpdm.opensearch.enabled"],
-    havingValue = "true",
-    matchIfMissing = false
-)
-class OpenSearchEnabledConfig
-
-@Configuration
-@Import(OpenSearchMockConfig::class)
-@ConditionalOnProperty(
-    value = ["bpdm.opensearch.enabled"],
-    havingValue = "false",
-    matchIfMissing = true
-)
-class OpenSearchDisabledConfig
+class OpenSearchEnabledConfig
diff --git a/bpdm-pool/src/main/resources/application.properties b/bpdm-pool/src/main/resources/application.properties
@@ -48,7 +48,7 @@ management.health.readinessState.enabled=true
 #Disable Security on default
 bpdm.security.enabled=false
 #Opensearch configuration
-bpdm.opensearch.enabled=true
+
 bpdm.opensearch.host=localhost
 bpdm.opensearch.port=9200
 bpdm.opensearch.scheme=http

diff --git a/.../test/kotlin/org/eclipse/tractusx/bpdm/pool/component/opensearch/InvalidIndexStartupIT.kt b/.../test/kotlin/org/eclipse/tractusx/bpdm/pool/component/opensearch/InvalidIndexStartupIT.kt
@@ -19,8 +19,6 @@
 
 package org.eclipse.tractusx.bpdm.pool.component.opensearch
 
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration
-import com.github.tomakehurst.wiremock.junit5.WireMockExtension
 import org.assertj.core.api.Assertions.assertThat
 import org.eclipse.tractusx.bpdm.common.dto.request.PaginationRequest
 import org.eclipse.tractusx.bpdm.pool.Application
@@ -32,7 +30,6 @@ import org.junit.jupiter.api.MethodOrderer.OrderAnnotation
 import org.junit.jupiter.api.Order
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestMethodOrder
-import org.junit.jupiter.api.extension.RegisterExtension
 import org.opensearch.client.opensearch.OpenSearchClient
 import org.opensearch.client.opensearch._types.Refresh
 import org.springframework.beans.factory.annotation.Autowired
@@ -55,13 +52,7 @@ class InvalidIndexStartupIT @Autowired constructor(
     private val poolClient: PoolClientImpl
 ) {
 
-    companion object {
-        @RegisterExtension
-        var wireMockServer: WireMockExtension = WireMockExtension.newInstance()
-            .options(WireMockConfiguration.wireMockConfig().dynamicPort())
-            .build()
 
-    }
 
     val bpnBogusDocument = "BPN_FAKE"
 

diff --git a/...rc/test/kotlin/org/eclipse/tractusx/bpdm/pool/component/opensearch/ValidIndexStartupIT.kt b/...rc/test/kotlin/org/eclipse/tractusx/bpdm/pool/component/opensearch/ValidIndexStartupIT.kt
@@ -19,8 +19,6 @@
 
 package org.eclipse.tractusx.bpdm.pool.component.opensearch
 
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration
-import com.github.tomakehurst.wiremock.junit5.WireMockExtension
 import org.assertj.core.api.Assertions
 import org.eclipse.tractusx.bpdm.common.dto.request.PaginationRequest
 import org.eclipse.tractusx.bpdm.pool.Application
@@ -31,7 +29,6 @@ import org.junit.jupiter.api.MethodOrderer
 import org.junit.jupiter.api.Order
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestMethodOrder
-import org.junit.jupiter.api.extension.RegisterExtension
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.annotation.DirtiesContext
@@ -51,13 +48,6 @@ class ValidIndexStartupIT @Autowired constructor(
     val poolClient: PoolClientImpl
 ) {
 
-    companion object {
-        @RegisterExtension
-        var wireMockServer: WireMockExtension = WireMockExtension.newInstance()
-            .options(WireMockConfiguration.wireMockConfig().dynamicPort())
-            .build()
-
-    }
 
     /**
      * Not a real test but prepares the OpenSearch container for the next test that will be run in a fresh Spring-Boot context

diff --git a/.../org/eclipse/tractusx/bpdm/pool/component/opensearch/controller/OpenSearchControllerIT.kt b/.../org/eclipse/tractusx/bpdm/pool/component/opensearch/controller/OpenSearchControllerIT.kt
@@ -21,9 +21,6 @@ package org.eclipse.tractusx.bpdm.pool.component.opensearch.controller
 
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.github.tomakehurst.wiremock.client.WireMock
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration
-import com.github.tomakehurst.wiremock.junit5.WireMockExtension
 import org.assertj.core.api.Assertions.assertThat
 import org.eclipse.tractusx.bpdm.common.dto.request.PaginationRequest
 import org.eclipse.tractusx.bpdm.common.dto.response.PageDto
@@ -35,13 +32,10 @@ import org.eclipse.tractusx.bpdm.pool.component.opensearch.impl.service.OpenSear
 import org.eclipse.tractusx.bpdm.pool.util.*
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.RegisterExtension
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.DynamicPropertyRegistry
-import org.springframework.test.context.DynamicPropertySource
 import org.springframework.test.web.reactive.server.WebTestClient
 
 
@@ -61,23 +55,7 @@ class OpenSearchControllerIT @Autowired constructor(
     private val poolClient: PoolClientImpl
 ) {
 
-    companion object {
-        // Configuration properties of Saas mock
-        private val exchangeApiUrl: String = "data-exchange/rest/v4"
-        private val storage: String = "storage_id"
-        val readBusinessPartnerUrl = "/${exchangeApiUrl}/storages/${storage}/businesspartners"
-
-        @RegisterExtension
-        var wireMockServer: WireMockExtension = WireMockExtension.newInstance()
-            .options(WireMockConfiguration.wireMockConfig().dynamicPort())
-            .build()
-
-        @JvmStatic
-        @DynamicPropertySource
-        fun properties(registry: DynamicPropertyRegistry) {
-            registry.add("bpdm.saas.host") { wireMockServer.baseUrl() }
-        }
-    }
+
 
     // We import 3 legal entities which result in 6 OpenSearch records: 3 for the LEs itself and 3 for the corresponding legal addresses.
     val partnerDocs = listOf(
@@ -99,14 +77,6 @@ class OpenSearchControllerIT @Autowired constructor(
             partnerDocs
         )
 
-        wireMockServer.stubFor(
-            WireMock.get(WireMock.urlPathMatching(readBusinessPartnerUrl))
-                .willReturn(
-                    WireMock.aResponse()
-                        .withHeader("Content-Type", "application/json")
-                        .withBody(objectMapper.writeValueAsString(importCollection))
-                )
-        )
         testHelpers.createTestMetadata()
         testHelpers.createBusinessPartnerStructure(
             listOf(

diff --git a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/AddressControllerIT.kt b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/AddressControllerIT.kt
@@ -36,7 +36,7 @@ import org.springframework.test.context.ContextConfiguration
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = [Application::class, TestHelpers::class])
 @ActiveProfiles("test")
-@ContextConfiguration(initializers = [PostgreSQLContextInitializer::class])
+@ContextConfiguration(initializers = [PostgreSQLContextInitializer::class,OpenSearchContextInitializer::class])
 class AddressControllerIT @Autowired constructor(
     val testHelpers: TestHelpers,
     val poolClient: PoolApiClient

diff --git a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/BpnControllerIT.kt b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/BpnControllerIT.kt
@@ -19,21 +19,15 @@
 
 package org.eclipse.tractusx.bpdm.pool.controller
 
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration
-import com.github.tomakehurst.wiremock.junit5.WireMockExtension
 import org.assertj.core.api.Assertions.assertThat
 import org.eclipse.tractusx.bpdm.common.dto.IdentifierBusinessPartnerType
 import org.eclipse.tractusx.bpdm.common.dto.LegalEntityIdentifierDto
 import org.eclipse.tractusx.bpdm.pool.Application
 import org.eclipse.tractusx.bpdm.pool.api.client.PoolClientImpl
 import org.eclipse.tractusx.bpdm.pool.api.model.request.IdentifiersSearchRequest
-import org.eclipse.tractusx.bpdm.pool.util.LegalEntityStructureRequest
-import org.eclipse.tractusx.bpdm.pool.util.PostgreSQLContextInitializer
-import org.eclipse.tractusx.bpdm.pool.util.RequestValues
-import org.eclipse.tractusx.bpdm.pool.util.TestHelpers
+import org.eclipse.tractusx.bpdm.pool.util.*
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.RegisterExtension
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.context.ActiveProfiles
@@ -44,18 +38,11 @@ import org.springframework.test.context.ContextConfiguration
     properties = ["bpdm.controller.search-request-limit=2"]
 )
 @ActiveProfiles("test")
-@ContextConfiguration(initializers = [PostgreSQLContextInitializer::class])
+@ContextConfiguration(initializers = [PostgreSQLContextInitializer::class, OpenSearchContextInitializer::class])
 class BpnControllerIT @Autowired constructor(
     val testHelpers: TestHelpers,
     val poolClient: PoolClientImpl
 ) {
-    companion object {
-        @RegisterExtension
-        val wireMockServer: WireMockExtension = WireMockExtension.newInstance()
-            .options(WireMockConfiguration.wireMockConfig().dynamicPort())
-            .build()
-
-    }
 
     val identifierType = RequestValues.legalEntityCreate1.legalEntity.identifiers.first().type
     val identifierValue1 = RequestValues.legalEntityCreate1.legalEntity.identifiers.first().value

diff --git a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/ChangelogControllerIT.kt b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/ChangelogControllerIT.kt
@@ -43,7 +43,7 @@ import java.util.*
     properties = ["bpdm.controller.search-request-limit=2"]
 )
 @ActiveProfiles("test")
-@ContextConfiguration(initializers = [PostgreSQLContextInitializer::class])
+@ContextConfiguration(initializers = [PostgreSQLContextInitializer::class,OpenSearchContextInitializer::class])
 class ChangelogControllerIT @Autowired constructor(
     val testHelpers: TestHelpers,
     val poolClient: PoolClientImpl