From a7bf96efb0f9a734789bcf03ea9816efca49b7b3 Mon Sep 17 00:00:00 2001 From: anjumabbas Date: Wed, 4 Jan 2023 17:14:27 +0000 Subject: [PATCH 1/4] API-5560 - Copyright 2023 changes --- .../hmrc/apisubscriptionfields/config/ApplicationConfig.scala | 2 +- .../hmrc/apisubscriptionfields/connector/JsonFormatters.scala | 2 +- app/uk/gov/hmrc/apisubscriptionfields/connector/Model.scala | 2 +- .../connector/PushPullNotificationServiceConnector.scala | 2 +- .../controller/ApiFieldDefinitionsController.scala | 2 +- app/uk/gov/hmrc/apisubscriptionfields/controller/Binders.scala | 2 +- .../apisubscriptionfields/controller/CommonController.scala | 2 +- app/uk/gov/hmrc/apisubscriptionfields/controller/Requests.scala | 2 +- .../controller/SubscriptionFieldsController.scala | 2 +- .../hmrc/apisubscriptionfields/model/AccessRequirements.scala | 2 +- .../gov/hmrc/apisubscriptionfields/model/JsonFormatters.scala | 2 +- app/uk/gov/hmrc/apisubscriptionfields/model/Model.scala | 2 +- app/uk/gov/hmrc/apisubscriptionfields/model/Responses.scala | 2 +- app/uk/gov/hmrc/apisubscriptionfields/model/Shared.scala | 2 +- app/uk/gov/hmrc/apisubscriptionfields/model/Topics.scala | 2 +- app/uk/gov/hmrc/apisubscriptionfields/model/Types.scala | 2 +- .../repository/FieldDefinitionRepository.scala | 2 +- .../repository/SubscriptionFieldsRepository.scala | 2 +- .../service/ApiFieldDefinitionsService.scala | 2 +- .../service/PushPullNotificationService.scala | 2 +- .../service/SubscriptionFieldsService.scala | 2 +- .../hmrc/apisubscriptionfields/utils/ApplicationLogger.scala | 2 +- conf/application.conf | 2 +- test/uk/gov/hmrc/apisubscriptionfields/AsyncHmrcSpec.scala | 2 +- .../hmrc/apisubscriptionfields/FieldDefinitionTestData.scala | 2 +- .../hmrc/apisubscriptionfields/SubscriptionFieldsTestData.scala | 2 +- test/uk/gov/hmrc/apisubscriptionfields/TestData.scala | 2 +- .../connector/PushPullNotificationServiceConnectorSpec.scala | 2 +- .../controller/ApiFieldDefinitionsControllerDeleteSpec.scala | 2 +- .../controller/ApiFieldDefinitionsControllerGetSpec.scala | 2 +- .../controller/ApiFieldDefinitionsControllerPostSpec.scala | 2 +- .../controller/ApiFieldDefinitionsControllerPutSpec.scala | 2 +- .../controller/SubscriptionFieldsControllerGetSpec.scala | 2 +- .../controller/SubscriptionFieldsControllerPutSpec.scala | 2 +- .../apisubscriptionfields/model/AccessRequirementsSpec.scala | 2 +- .../hmrc/apisubscriptionfields/model/JsonFormatterSpec.scala | 2 +- test/uk/gov/hmrc/apisubscriptionfields/model/ModelSpec.scala | 2 +- .../apisubscriptionfields/model/ValidationRuleTestData.scala | 2 +- .../repository/ApiFieldDefinitionsRepositorySpec.scala | 2 +- .../apisubscriptionfields/repository/MongoFormattersSpec.scala | 2 +- .../repository/SubscriptionFieldsRepositorySpec.scala | 2 +- .../service/ApiFieldDefinitionsServiceSpec.scala | 2 +- .../service/PushPullNotificationServiceSpec.scala | 2 +- .../service/SubscriptionFieldsServiceSpec.scala | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/uk/gov/hmrc/apisubscriptionfields/config/ApplicationConfig.scala b/app/uk/gov/hmrc/apisubscriptionfields/config/ApplicationConfig.scala index 5d312e7..995cb6d 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/config/ApplicationConfig.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/config/ApplicationConfig.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/connector/JsonFormatters.scala b/app/uk/gov/hmrc/apisubscriptionfields/connector/JsonFormatters.scala index 1292ca8..e0094c4 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/connector/JsonFormatters.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/connector/JsonFormatters.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/connector/Model.scala b/app/uk/gov/hmrc/apisubscriptionfields/connector/Model.scala index 64dc908..1e36198 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/connector/Model.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/connector/Model.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/connector/PushPullNotificationServiceConnector.scala b/app/uk/gov/hmrc/apisubscriptionfields/connector/PushPullNotificationServiceConnector.scala index 641cbc6..acdc72e 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/connector/PushPullNotificationServiceConnector.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/connector/PushPullNotificationServiceConnector.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsController.scala b/app/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsController.scala index ff77dea..1b6e96f 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsController.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsController.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/controller/Binders.scala b/app/uk/gov/hmrc/apisubscriptionfields/controller/Binders.scala index f3a6c60..abcdcfa 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/controller/Binders.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/controller/Binders.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/controller/CommonController.scala b/app/uk/gov/hmrc/apisubscriptionfields/controller/CommonController.scala index ab3d30e..a1c3589 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/controller/CommonController.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/controller/CommonController.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/controller/Requests.scala b/app/uk/gov/hmrc/apisubscriptionfields/controller/Requests.scala index da27925..d300941 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/controller/Requests.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/controller/Requests.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsController.scala b/app/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsController.scala index 8a864bc..c820ed8 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsController.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsController.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/model/AccessRequirements.scala b/app/uk/gov/hmrc/apisubscriptionfields/model/AccessRequirements.scala index 09243b3..6059ed7 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/model/AccessRequirements.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/model/AccessRequirements.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/model/JsonFormatters.scala b/app/uk/gov/hmrc/apisubscriptionfields/model/JsonFormatters.scala index 22c772a..e2ca4a3 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/model/JsonFormatters.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/model/JsonFormatters.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/model/Model.scala b/app/uk/gov/hmrc/apisubscriptionfields/model/Model.scala index 9b29b22..b5a653e 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/model/Model.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/model/Model.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/model/Responses.scala b/app/uk/gov/hmrc/apisubscriptionfields/model/Responses.scala index 82d6d85..95d4038 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/model/Responses.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/model/Responses.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/model/Shared.scala b/app/uk/gov/hmrc/apisubscriptionfields/model/Shared.scala index 350dd12..e35827d 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/model/Shared.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/model/Shared.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/model/Topics.scala b/app/uk/gov/hmrc/apisubscriptionfields/model/Topics.scala index 3e8bf48..42fd66f 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/model/Topics.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/model/Topics.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/model/Types.scala b/app/uk/gov/hmrc/apisubscriptionfields/model/Types.scala index 7cb3c53..1632276 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/model/Types.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/model/Types.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/repository/FieldDefinitionRepository.scala b/app/uk/gov/hmrc/apisubscriptionfields/repository/FieldDefinitionRepository.scala index 2b08f72..27f58c0 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/repository/FieldDefinitionRepository.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/repository/FieldDefinitionRepository.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/repository/SubscriptionFieldsRepository.scala b/app/uk/gov/hmrc/apisubscriptionfields/repository/SubscriptionFieldsRepository.scala index 138174b..b9ea88c 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/repository/SubscriptionFieldsRepository.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/repository/SubscriptionFieldsRepository.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/service/ApiFieldDefinitionsService.scala b/app/uk/gov/hmrc/apisubscriptionfields/service/ApiFieldDefinitionsService.scala index 0fafcd4..1e950ab 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/service/ApiFieldDefinitionsService.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/service/ApiFieldDefinitionsService.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/service/PushPullNotificationService.scala b/app/uk/gov/hmrc/apisubscriptionfields/service/PushPullNotificationService.scala index 203a08f..6a4a2b2 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/service/PushPullNotificationService.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/service/PushPullNotificationService.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala b/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala index 6cb12a0..c24b36e 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/app/uk/gov/hmrc/apisubscriptionfields/utils/ApplicationLogger.scala b/app/uk/gov/hmrc/apisubscriptionfields/utils/ApplicationLogger.scala index 2009bad..78fa4da 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/utils/ApplicationLogger.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/utils/ApplicationLogger.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/conf/application.conf b/conf/application.conf index 75b83cc..a8222ab 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -1,4 +1,4 @@ -# Copyright 2022 HM Revenue & Customs +# Copyright 2023 HM Revenue & Customs # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/AsyncHmrcSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/AsyncHmrcSpec.scala index d20fc5a..3a6c46a 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/AsyncHmrcSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/AsyncHmrcSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/FieldDefinitionTestData.scala b/test/uk/gov/hmrc/apisubscriptionfields/FieldDefinitionTestData.scala index 00d10e4..dea0226 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/FieldDefinitionTestData.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/FieldDefinitionTestData.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/SubscriptionFieldsTestData.scala b/test/uk/gov/hmrc/apisubscriptionfields/SubscriptionFieldsTestData.scala index 8f92fe2..07de783 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/SubscriptionFieldsTestData.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/SubscriptionFieldsTestData.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/TestData.scala b/test/uk/gov/hmrc/apisubscriptionfields/TestData.scala index f3a7a04..9309eaf 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/TestData.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/TestData.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/connector/PushPullNotificationServiceConnectorSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/connector/PushPullNotificationServiceConnectorSpec.scala index c5bbdf9..4c38491 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/connector/PushPullNotificationServiceConnectorSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/connector/PushPullNotificationServiceConnectorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerDeleteSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerDeleteSpec.scala index ac65d7f..dc46b96 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerDeleteSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerDeleteSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerGetSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerGetSpec.scala index 854b5e5..b517bb6 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerGetSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerGetSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerPostSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerPostSpec.scala index 79a9a59..92d7834 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerPostSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerPostSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerPutSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerPutSpec.scala index af905e2..ed52443 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerPutSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/controller/ApiFieldDefinitionsControllerPutSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsControllerGetSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsControllerGetSpec.scala index 7b8299e..18c0f45 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsControllerGetSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsControllerGetSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsControllerPutSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsControllerPutSpec.scala index d7e4f2e..fc3a94e 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsControllerPutSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/controller/SubscriptionFieldsControllerPutSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/model/AccessRequirementsSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/model/AccessRequirementsSpec.scala index 040e34b..dcdc876 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/model/AccessRequirementsSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/model/AccessRequirementsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/model/JsonFormatterSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/model/JsonFormatterSpec.scala index 67a3e00..3dc29c3 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/model/JsonFormatterSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/model/JsonFormatterSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/model/ModelSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/model/ModelSpec.scala index 7d1eeec..7b19b45 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/model/ModelSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/model/ModelSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/model/ValidationRuleTestData.scala b/test/uk/gov/hmrc/apisubscriptionfields/model/ValidationRuleTestData.scala index 91f755b..3183e19 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/model/ValidationRuleTestData.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/model/ValidationRuleTestData.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/repository/ApiFieldDefinitionsRepositorySpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/repository/ApiFieldDefinitionsRepositorySpec.scala index b19c949..1ae35d7 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/repository/ApiFieldDefinitionsRepositorySpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/repository/ApiFieldDefinitionsRepositorySpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/repository/MongoFormattersSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/repository/MongoFormattersSpec.scala index 486ea44..22e998a 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/repository/MongoFormattersSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/repository/MongoFormattersSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/repository/SubscriptionFieldsRepositorySpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/repository/SubscriptionFieldsRepositorySpec.scala index 28fe3c6..c3b8a76 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/repository/SubscriptionFieldsRepositorySpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/repository/SubscriptionFieldsRepositorySpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/service/ApiFieldDefinitionsServiceSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/service/ApiFieldDefinitionsServiceSpec.scala index c83df7a..92df74e 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/service/ApiFieldDefinitionsServiceSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/service/ApiFieldDefinitionsServiceSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/service/PushPullNotificationServiceSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/service/PushPullNotificationServiceSpec.scala index 61f77f1..045e14b 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/service/PushPullNotificationServiceSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/service/PushPullNotificationServiceSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsServiceSpec.scala b/test/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsServiceSpec.scala index 9f15840..52def7a 100644 --- a/test/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsServiceSpec.scala +++ b/test/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsServiceSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 HM Revenue & Customs * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 822373ba98ed7289a738433225c83e67bef94e31 Mon Sep 17 00:00:00 2001 From: anjumabbas Date: Wed, 4 Jan 2023 17:22:47 +0000 Subject: [PATCH 2/4] API-5560 - Bootstrap play upgrade 7.12 --- build.sbt | 2 +- project/AppDependencies.scala | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index 80b92ff..eb5c5cd 100644 --- a/build.sbt +++ b/build.sbt @@ -78,4 +78,4 @@ lazy val acceptanceTestSettings = def onPackageName(rootPackage: String): String => Boolean = { testName => testName startsWith rootPackage } // Note that this task has to be scoped globally -bloopAggregateSourceDependencies in Global := true +Global / bloopAggregateSourceDependencies := true diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala index 39bfa7c..cc1f64f 100644 --- a/project/AppDependencies.scala +++ b/project/AppDependencies.scala @@ -4,8 +4,8 @@ import play.core.PlayVersion object AppDependencies { def apply(): Seq[ModuleID] = dependencies ++ testDependencies - private lazy val mongoVersion = "0.70.0" - private lazy val bootstrapVersion = "7.2.0" + private lazy val mongoVersion = "0.74.0" + private lazy val bootstrapVersion = "7.12.0" private lazy val dependencies = Seq( "uk.gov.hmrc" %% "bootstrap-backend-play-28" % bootstrapVersion, diff --git a/project/build.properties b/project/build.properties index c8fcab5..563a014 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.7.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 97de479..f633872 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,10 +3,10 @@ resolvers += Resolver.url("HMRC-open-artefacts-ivy", url("https://open.artefacts resolvers += "Typesafe Releases" at "https://repo.typesafe.com/typesafe/releases/" -addSbtPlugin("uk.gov.hmrc" %% "sbt-auto-build" % "3.8.0") -addSbtPlugin("uk.gov.hmrc" %% "sbt-distributables" % "2.1.0") -addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "2.0.0") -addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") -addSbtPlugin("com.typesafe.play" %% "sbt-plugin" % "2.8.7") +addSbtPlugin("uk.gov.hmrc" %% "sbt-auto-build" % "3.8.0") +addSbtPlugin("uk.gov.hmrc" %% "sbt-distributables" % "2.1.0") +addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "2.0.0") +addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") +addSbtPlugin("com.typesafe.play" %% "sbt-plugin" % "2.8.18") -addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.9") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.9") From 5638fa25cb5beb5b78750b783e9a8873395425a0 Mon Sep 17 00:00:00 2001 From: anjumabbas Date: Wed, 4 Jan 2023 18:20:38 +0000 Subject: [PATCH 3/4] API-5560 - PR Bot changes --- .../service/SubscriptionFieldsService.scala | 6 +++--- conf/application-json-logger.xml | 4 ++-- conf/application.conf | 6 ------ .../repository/ApiFieldDefinitionsRepositorySpec.scala | 4 ++-- .../service/SubscriptionFieldsServiceSpec.scala | 1 + 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala b/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala index c24b36e..dc9bf6b 100644 --- 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 index 75222d7..eea14a6 100644 --- a/conf/application-json-logger.xml +++ b/conf/application-json-logger.xml @@ -5,9 +5,9 @@ - + - + diff --git a/conf/application.conf b/conf/application.conf index a8222ab..f24c169 100644 --- 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 index 1ae35d7..2853968 100644 --- 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 index 52def7a..d9518c3 100644 --- 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} From 84b42e9f70ebe6e358e803eccce6ca845f5bc9d8 Mon Sep 17 00:00:00 2001 From: anjumabbas Date: Wed, 4 Jan 2023 18:26:36 +0000 Subject: [PATCH 4/4] API-5560 - Tidy up --- .../service/SubscriptionFieldsService.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala b/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala index dc9bf6b..3dab866 100644 --- a/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala +++ b/app/uk/gov/hmrc/apisubscriptionfields/service/SubscriptionFieldsService.scala @@ -20,7 +20,6 @@ import javax.inject._ import uk.gov.hmrc.apisubscriptionfields.model._ import Types._ -//import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.{ExecutionContext, Future} import scala.concurrent.Future.successful import cats.data.NonEmptyList