diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/HmppsBoldLrsExceptionHandler.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/HmppsBoldLrsExceptionHandler.kt index 6af62cc..9ce7dea 100644 --- a/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/HmppsBoldLrsExceptionHandler.kt +++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/HmppsBoldLrsExceptionHandler.kt @@ -2,7 +2,10 @@ package uk.gov.justice.digital.hmpps.learnerrecordsapi.config import org.apache.commons.lang3.StringUtils import org.springframework.http.HttpStatus -import org.springframework.http.HttpStatus.* +import org.springframework.http.HttpStatus.BAD_REQUEST +import org.springframework.http.HttpStatus.FORBIDDEN +import org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR +import org.springframework.http.HttpStatus.NOT_FOUND import org.springframework.http.ResponseEntity import org.springframework.validation.BindingResult import org.springframework.web.bind.MethodArgumentNotValidException diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/HttpClientConfiguration.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/HttpClientConfiguration.kt index 2bd6ddd..f4a337f 100644 --- a/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/HttpClientConfiguration.kt +++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/HttpClientConfiguration.kt @@ -16,10 +16,10 @@ class HttpClientConfiguration( ) { fun sslHttpClient(): OkHttpClient { log.info("Building HTTP Client With SSL") - val sslContextProvider = SSLContextProvider(pfxFilePath) - val sslContext = sslContextProvider.createSSLContext() + val sslContextConfiguration = SSLContextConfiguration(pfxFilePath) + val sslContext = sslContextConfiguration.createSSLContext() - val trustManager = sslContextProvider.getTrustManager() + val trustManager = sslContextConfiguration.getTrustManager() val loggingInterceptor = HttpLoggingInterceptor() loggingInterceptor.level = Level.BODY diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/SSLContextConfiguration.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/SSLContextConfiguration.kt index 0a78380..185ec9a 100644 --- a/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/SSLContextConfiguration.kt +++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/SSLContextConfiguration.kt @@ -15,10 +15,10 @@ private const val PFX_FILE_TYPE = "PKCS12" private const val PROTOCOL = "TLS" -class SSLContextProvider(private val pfxFilePath: String) { +class SSLContextConfiguration(private val pfxFilePath: String) { fun createSSLContext(): SSLContext { - val logger = LoggerFactory.getLogger(SSLContextProvider::class.java) + val logger = LoggerFactory.getLogger(SSLContextConfiguration::class.java) val passwordEnv = System.getenv(PFX_FILE_PASSWORD) diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/PLRResource.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/PLRResource.kt index 564b83b..842e062 100644 --- a/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/PLRResource.kt +++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/PLRResource.kt @@ -2,7 +2,10 @@ package uk.gov.justice.digital.hmpps.learnerrecordsapi.resource import jakarta.validation.Valid import org.springframework.security.access.prepost.PreAuthorize -import org.springframework.web.bind.annotation.* +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController import uk.gov.justice.digital.hmpps.learnerrecordsapi.openapi.FindByULNApi import uk.gov.justice.digital.hmpps.learnerrecordsapi.service.PLRService diff --git a/src/test/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/SSLContextProviderTest.kt b/src/test/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/SSLContextProviderTest.kt deleted file mode 100644 index ce1fd16..0000000 --- a/src/test/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/SSLContextProviderTest.kt +++ /dev/null @@ -1,10 +0,0 @@ -package uk.gov.justice.digital.hmpps.learnerrecordsapi.config - -import org.junit.jupiter.api.Assertions.* - -class SSLContextProviderTest { - - fun `Creates SSL Context when a path to the certificate file is provided`() { - val sslContextProvider = SSLContextProvider("somethingPathToFile") - } -} diff --git a/src/test/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/service/PLRServiceTest.kt b/src/test/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/service/PLRServiceTest.kt index 0c0bb61..b3f3a03 100644 --- a/src/test/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/service/PLRServiceTest.kt +++ b/src/test/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/service/PLRServiceTest.kt @@ -5,15 +5,15 @@ import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith -import org.mockito.Mockito.* +import org.mockito.Mockito.mock +import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` import org.mockito.junit.jupiter.MockitoExtension import org.mockito.kotlin.any import retrofit2.Response import uk.gov.justice.digital.hmpps.learnerrecordsapi.config.AppConfig import uk.gov.justice.digital.hmpps.learnerrecordsapi.config.HttpClientConfiguration -import uk.gov.justice.digital.hmpps.learnerrecordsapi.interfaces.LRSApiServiceInterface import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.lrsapi.response.LearningEventsEnvelope -import uk.gov.justice.digital.hmpps.learnerrecordsapi.models.request.GetPLRByULNRequest import java.time.LocalDate @ExtendWith(MockitoExtension::class)