API-5560 - PR Bot changes

hmrc · Jan 4, 2023 · 5638fa2 · 5638fa2
1 parent 822373b
commit 5638fa2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala b/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala
@@ -20,8 +20,8 @@ import javax.inject._
 import uk.gov.hmrc.apisubscriptionfields.model._
 import Types._
 
-import scala.concurrent.ExecutionContext.Implicits.global
-import scala.concurrent.Future
+//import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.{ExecutionContext, Future}
 import scala.concurrent.Future.successful
 import cats.data.NonEmptyList
 import uk.gov.hmrc.apisubscriptionfields.repository.SubscriptionFieldsRepository
@@ -32,7 +32,7 @@ import cats.data.{NonEmptyList => NEL}
 class SubscriptionFieldsService @Inject() (
                                           repository: SubscriptionFieldsRepository,
                                           apiFieldDefinitionsService: ApiFieldDefinitionsService,
-                                          pushPullNotificationService: PushPullNotificationService) {
+                                          pushPullNotificationService: PushPullNotificationService)(implicit ec: ExecutionContext) {
 
 
   private def validate(fields: Fields, fieldDefinitions: NonEmptyList[FieldDefinition]): SubsFieldValidationResponse = {

diff --git a/conf/application-json-logger.xml b/conf/application-json-logger.xml
@@ -5,9 +5,9 @@
         <encoder class="uk.gov.hmrc.play.logging.JsonEncoder"/>
     </appender>
 
-    <logger name="uk.gov" level="${logger.uk.gov:-WARN}"/>
+    <logger name="uk.gov" level="WARN"/>
 
-    <root level="${logger.application:-WARN}">
+    <root level="WARN">
         <appender-ref ref="STDOUT"/>
     </root>
 

diff --git a/conf/application.conf b/conf/application.conf
@@ -53,12 +53,6 @@ play.modules.enabled += "uk.gov.hmrc.play.http.metrics.Module"
 # timeout 15 minutes after login (regardless of user activity).
 # session.maxAge=900
 
-# Secret key
-# ~~~~~
-# The secret key is used to secure cryptographics functions.
-# If you deploy your application to several instances be sure to use the same key!
-play.http.secret.key = "VJ2GT0tQY4ucpdoPeAeJ2hHCPCBYx6gxthXL2WkoOMMgtbgvswGurFEOzhMzOX4q"
-
 # Session configuration
 # ~~~~~
 play.http.session.httpOnly = false

diff --git a/test/uk/gov/hmrc/apisubscriptionfields/repository/ApiFieldDefinitionsRepositorySpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/repository/ApiFieldDefinitionsRepositorySpec.scala
@@ -19,10 +19,10 @@ package uk.gov.hmrc.apisubscriptionfields.repository
 import org.mongodb.scala.model.Filters
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, OptionValues}
+import org.scalatest.{BeforeAndAfterEach, OptionValues}
 import org.scalatestplus.play.guice.GuiceOneAppPerSuite
 import play.api.test.{DefaultAwaitTimeout, FutureAwaits}
-import uk.gov.hmrc.apisubscriptionfields.model.{ApiContext, ApiFieldDefinitions, ApiVersion, JsonFormatters}
+import uk.gov.hmrc.apisubscriptionfields.model.{ApiContext, ApiFieldDefinitions}
 import uk.gov.hmrc.apisubscriptionfields.SubscriptionFieldsTestData.{FakeContext, FakeVersion, NelOfFieldDefinitions, uniqueApiContext}
 import uk.gov.hmrc.mongo.play.json.Codecs
 

diff --git a/test/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsServiceSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsServiceSpec.scala
@@ -24,6 +24,7 @@ import uk.gov.hmrc.apisubscriptionfields.model._
 import uk.gov.hmrc.apisubscriptionfields.repository._
 import uk.gov.hmrc.apisubscriptionfields.{AsyncHmrcSpec, FieldDefinitionTestData, SubscriptionFieldsTestData}
 import uk.gov.hmrc.http.HeaderCarrier
+import scala.concurrent.ExecutionContext.Implicits.global
 
 import scala.concurrent.Future.{failed, successful}