Merge pull request #1016 from hmrc/DDCYLS-4994

Ddcyls 4994
hmrc · Apr 26, 2024 · 65b68a7 · 65b68a7
2 parents 1418d66 + e6e4826
commit 65b68a7
Show file tree

Hide file tree

Showing 217 changed files with 384 additions and 382 deletions.
diff --git a/README.md b/README.md
@@ -8,9 +8,9 @@ vat-api has five endpoints:
   - GET liabilities
 
 ### Prerequisites 
-- Scala 2.12.x
-- Java 8
-- sbt > 1.3.7
+- Scala 2.13.x
+- Java 21
+- sbt > 1.9.7
 - [Service Manager](https://github.com/hmrc/service-manager)
 
 ### Development Setup
@@ -21,7 +21,7 @@ Run from the console using: `sbt "~run 9675"`
 Task | Description | Command
 :-------|:------------|:-----
 test | Runs the standard unit tests | ```$ sbt test```
-func:test  | Runs the functional tests | ```$ sbt func:test ```
+func:test  | Runs the functional tests | ```$ sbt func/test ```
 dependencyCheck | Runs dependency-check against the current project. It aggregates dependencies and generates a report | ```$ sbt dependencyCheck```
 dependencyUpdates |  Shows a list of project dependencies that can be updated | ```$ sbt dependencyUpdates```
 dependencyUpdatesReport | Writes a list of project dependencies to a file | ```$ sbt dependencyUpdatesReport```

diff --git a/app/config/AppConfig.scala b/app/config/AppConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/config/DIModule.scala b/app/config/DIModule.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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.
@@ -16,7 +16,7 @@
 
 package config
 
-import akka.actor.{ActorSystem, Scheduler}
+import org.apache.pekko.actor.{ActorSystem, Scheduler}
 import com.google.inject.{AbstractModule, Provides}
 
 class DIModule extends AbstractModule {
@@ -26,6 +26,6 @@ class DIModule extends AbstractModule {
   }
 
   @Provides
-  def akkaScheduler(actorSystem: ActorSystem): Scheduler =
+  def pekkoScheduler(actorSystem: ActorSystem): Scheduler =
     actorSystem.scheduler
 }
diff --git a/app/config/DocumentationController.scala b/app/config/DocumentationController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/config/FeatureSwitch.scala b/app/config/FeatureSwitch.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/config/FeatureToggleSupport.scala b/app/config/FeatureToggleSupport.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/definition/ApiDefinition.scala b/app/definition/ApiDefinition.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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.
@@ -64,7 +64,7 @@ case class APIDefinition(name: String,
   require(uniqueVersions, "version numbers must be unique")
 
   private def uniqueVersions = {
-    !versions.map(_.version).groupBy(identity).mapValues(_.size).exists(_._2 > 1)
+    !versions.map(_.version).groupBy(identity).view.mapValues(_.size).toMap.exists(_._2 > 1)
   }
 }
 

diff --git a/app/definition/ApiDefinitionFactory.scala b/app/definition/ApiDefinitionFactory.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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.
@@ -17,6 +17,7 @@
 package definition
 
 import config.AppConfig
+
 import javax.inject.{Inject, Singleton}
 import utils.Logging
 

diff --git a/app/definition/Versions.scala b/app/definition/Versions.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/routing/VersionRoutingMap.scala b/app/routing/VersionRoutingMap.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/routing/VersionRoutingRequestHandler.scala b/app/routing/VersionRoutingRequestHandler.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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.
@@ -16,8 +16,9 @@
 
 package routing
 
-import config.{AppConfig, FeatureSwitch, FeatureToggleSupport}
+import config.{AppConfig, FeatureToggleSupport}
 import definition.Versions
+
 import javax.inject.{Inject, Singleton}
 import utils.Logging
 import play.api.http.{DefaultHttpRequestHandler, HttpConfiguration, HttpErrorHandler, HttpFilters}

diff --git a/app/utils/CurrentDateTime.scala b/app/utils/CurrentDateTime.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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.
@@ -16,17 +16,14 @@
 
 package utils
 
-import java.time.{LocalDateTime, OffsetDateTime}
-import java.time.format.DateTimeFormatter
-
+import java.time.OffsetDateTime
 import javax.inject.{Inject, Singleton}
 
 @Singleton
 class CurrentDateTime @Inject()() {
   def getDateTime: OffsetDateTime = OffsetDateTime.now()
   def dateString(currentDatetime: OffsetDateTime): OffsetDateTime = {
     val formatted = currentDatetime.format(DateUtils.dateTimePattern)
-    val formatter = DateUtils.dateTimePattern.format(OffsetDateTime.parse(currentDatetime.toString))
     OffsetDateTime.parse(formatted)
   }
 }
diff --git a/app/utils/DateUtils.scala b/app/utils/DateUtils.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/Delayer.scala b/app/utils/Delayer.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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.
@@ -17,7 +17,7 @@
 package utils
 
 
-import akka.actor.Scheduler
+import org.apache.pekko.actor.Scheduler
 
 import scala.concurrent.duration._
 import scala.concurrent.{ExecutionContext, Future, Promise}
@@ -28,7 +28,7 @@ trait Delayer {
   implicit val ec: ExecutionContext
 
   def delay(delay: FiniteDuration): Future[Unit] = {
-    val promise = Promise[Unit]
+    val promise = Promise[Unit]()
 
     scheduler.scheduleOnce(delay)(promise.success(()))
 

diff --git a/app/utils/EndpointLogContext.scala b/app/utils/EndpointLogContext.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/ErrorHandler.scala b/app/utils/ErrorHandler.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/FinancialDataReadsUtils.scala b/app/utils/FinancialDataReadsUtils.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/HashUtil.scala b/app/utils/HashUtil.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/IdGenerator.scala b/app/utils/IdGenerator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/JsonErrorSanitiser.scala b/app/utils/JsonErrorSanitiser.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/LegacyErrorHandler.scala b/app/utils/LegacyErrorHandler.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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.
@@ -20,7 +20,7 @@ import play.api._
 import play.api.http.DefaultHttpErrorHandler
 import play.api.libs.json.Json
 import play.api.mvc.Results.{BadRequest, NotImplemented}
-import play.api.mvc.{Request, RequestHeader, Result}
+import play.api.mvc.{RequestHeader, Result}
 import play.api.routing.Router
 import uk.gov.hmrc.http.NotImplementedException
 import v1.models.errors._

diff --git a/app/utils/Logging.scala b/app/utils/Logging.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/NestedJsonReads.scala b/app/utils/NestedJsonReads.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/Retrying.scala b/app/utils/Retrying.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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.
@@ -22,7 +22,7 @@ import scala.util.{Failure, Success, Try}
 import scala.util.control.NonFatal
 
 object Retrying {
-  private val fibonacci: Stream[Int] = 1 #:: fibonacci.scanLeft(1)(_ + _)
+  private val fibonacci: LazyList[Int] = 1 #:: fibonacci.scanLeft(1)(_ + _)
 
   def fibonacciDelays(initialDelay: FiniteDuration, numRetries: Int): List[FiniteDuration] =
     fibonacci.take(numRetries).map(i => i * initialDelay).toList

diff --git a/app/utils/Timer.scala b/app/utils/Timer.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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.
@@ -17,7 +17,6 @@
 package utils
 
 import com.codahale.metrics._
-import com.kenshoo.play.metrics.Metrics
 import play.api.mvc.Request
 
 import scala.concurrent.{ExecutionContext, Future}
@@ -28,7 +27,7 @@ trait Timer {
   val defaultTimerGroup: String = "timer"
   type Metric = String
 
-  val metrics: Metrics
+  val metrics: MetricRegistry
 
   def timeFuture[A](name: String, metric: Metric, timerGroup: String = defaultTimerGroup)(block: => Future[A])(
     implicit ec: ExecutionContext, request: Request[_]): Future[A] = {
@@ -43,8 +42,9 @@ trait Timer {
     finally stopAndLog(name, timer)
   }
 
-  protected def startTimer(metric: Metric, timerGroup: String): Timer.Context =
-    metrics.defaultRegistry.timer(s"$metric-$timerGroup").time()
+  protected def startTimer(metric: Metric, timerGroup: String): Timer.Context = {
+    metrics.timer(s"$metric-$timerGroup").time()
+  }
 
   protected def stopAndLog[A](name: String, timer: Timer.Context)(implicit request: Request[_]): Unit = {
     val timeMillis = timer.stop() / 1000000

diff --git a/app/utils/enums/Enums.scala b/app/utils/enums/Enums.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/enums/Values.scala b/app/utils/enums/Values.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/pagerDutyLogging/Endpoint.scala b/app/utils/pagerDutyLogging/Endpoint.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/pagerDutyLogging/PagerDutyLogging.scala b/app/utils/pagerDutyLogging/PagerDutyLogging.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/utils/pagerDutyLogging/PagerDutyLoggingEndpointName.scala b/app/utils/pagerDutyLogging/PagerDutyLoggingEndpointName.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/v1/audit/AuditEvents.scala b/app/v1/audit/AuditEvents.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/v1/connectors/BaseDownstreamConnector.scala b/app/v1/connectors/BaseDownstreamConnector.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/v1/connectors/DesUri.scala b/app/v1/connectors/DesUri.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/v1/connectors/LiabilitiesConnector.scala b/app/v1/connectors/LiabilitiesConnector.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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/v1/connectors/ObligationsConnector.scala b/app/v1/connectors/ObligationsConnector.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 HM Revenue & Customs
+ * Copyright 2024 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.