Merge pull request #76 from hmrc/GG-5208-openid-connect-userinfo

restructured package names
hmrc · Dec 21, 2020 · 208c776 · 208c776
2 parents 083d0e3 + b7bf178
commit 208c776
Show file tree

Hide file tree

Showing 51 changed files with 111 additions and 179 deletions.
diff --git a/...ect/userinfo/config/APIAccessConfig.scala → app/config/APIAccessConfig.scala b/...ect/userinfo/config/APIAccessConfig.scala → app/config/APIAccessConfig.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.config
+package config
 
 import com.typesafe.config.{Config, ConfigObject}
 

diff --git a/...dconnect/userinfo/config/AppContext.scala → app/config/AppContext.scala b/...dconnect/userinfo/config/AppContext.scala → app/config/AppContext.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.config
+package config
 
 import javax.inject.{Inject, Singleton}
 import com.typesafe.config.ConfigObject

diff --git a/...nnect/userinfo/config/FeatureSwitch.scala → app/config/FeatureSwitch.scala b/...nnect/userinfo/config/FeatureSwitch.scala → app/config/FeatureSwitch.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.config
+package config
 
 case class FeatureSwitch(name: String, isEnabled: Boolean)
 

diff --git a/...connect/userinfo/config/GuiceModule.scala → app/config/GuiceModule.scala b/...connect/userinfo/config/GuiceModule.scala → app/config/GuiceModule.scala
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.config
+package config
 
 import com.google.inject.AbstractModule
 import com.google.inject.name.Names
 import com.typesafe.config.Config
 import play.api.{Configuration, Environment}
 import uk.gov.hmrc.http.{CorePost, HttpGet}
-import uk.gov.hmrc.openidconnect.userinfo.connectors._
-import uk.gov.hmrc.openidconnect.userinfo.services.{LiveUserInfoService, SandboxUserInfoService, UserInfoService}
+import connectors._
+import services.{LiveUserInfoService, SandboxUserInfoService, UserInfoService}
 import uk.gov.hmrc.play.bootstrap.http.{DefaultHttpClient, HttpClient}
 import uk.gov.hmrc.play.bootstrap.config.ControllerConfig
 

diff --git a/...t/userinfo/connectors/AuthConnector.scala → app/connectors/AuthConnector.scala b/...t/userinfo/connectors/AuthConnector.scala → app/connectors/AuthConnector.scala
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.connectors
+package connectors
 
 import javax.inject.{Inject, Singleton}
 
 import com.github.ghik.silencer.silent
 import uk.gov.hmrc.auth.core.retrieve.{Retrievals, ~}
 import uk.gov.hmrc.auth.core.{AuthorisedFunctions, Enrolments, PlayAuthConnector}
 import uk.gov.hmrc.http.{CorePost, HeaderCarrier, NotFoundException}
-import uk.gov.hmrc.openidconnect.userinfo.domain.{Authority, DesUserInfo, UserDetails}
-import uk.gov.hmrc.openidconnect.userinfo.config.AppContext
+import domain.{Authority, DesUserInfo, UserDetails}
+import config.AppContext
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/...connectors/AuthV1UserDetailsFetcher.scala → ...connectors/AuthV1UserDetailsFetcher.scala b/...connectors/AuthV1UserDetailsFetcher.scala → ...connectors/AuthV1UserDetailsFetcher.scala
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.connectors
+package connectors
 
 import com.github.ghik.silencer.silent
 import uk.gov.hmrc.auth.core.AuthorisedFunctions
 import uk.gov.hmrc.auth.core.retrieve.{Retrievals, ~}
 import uk.gov.hmrc.http.{HeaderCarrier, NotFoundException}
-import uk.gov.hmrc.openidconnect.userinfo.domain.UserDetails
+import domain.UserDetails
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/...connectors/AuthV2UserDetailsFetcher.scala → ...connectors/AuthV2UserDetailsFetcher.scala b/...connectors/AuthV2UserDetailsFetcher.scala → ...connectors/AuthV2UserDetailsFetcher.scala
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.connectors
+package connectors
 
 import uk.gov.hmrc.auth.core.AuthorisedFunctions
 import uk.gov.hmrc.auth.core.retrieve.v2.Retrievals
 import uk.gov.hmrc.auth.core.retrieve.~
 import uk.gov.hmrc.http.{HeaderCarrier, NotFoundException}
-import uk.gov.hmrc.openidconnect.userinfo.domain.UserDetails
+import domain.UserDetails
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/...irdPartyDelegatedAuthorityConnector.scala → ...irdPartyDelegatedAuthorityConnector.scala b/...irdPartyDelegatedAuthorityConnector.scala → ...irdPartyDelegatedAuthorityConnector.scala
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.connectors
+package connectors
 
 import javax.inject.{Inject, Singleton}
 import play.api.http.Status
 
 import scala.concurrent.{ExecutionContext, Future}
 import uk.gov.hmrc.http.{HeaderCarrier, HttpGet, HttpResponse, NotFoundException}
-import uk.gov.hmrc.openidconnect.userinfo.config.AppContext
+import config.AppContext
 import uk.gov.hmrc.http.HttpReads.Implicits.readRaw
 
 import scala.util.control.NonFatal

diff --git a/...rinfo/connectors/UserDetailsFetcher.scala → app/connectors/UserDetailsFetcher.scala b/...rinfo/connectors/UserDetailsFetcher.scala → app/connectors/UserDetailsFetcher.scala
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.connectors
+package connectors
 
 import uk.gov.hmrc.http.HeaderCarrier
-import uk.gov.hmrc.openidconnect.userinfo.domain.UserDetails
+import domain.UserDetails
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/...controllers/DocumentationController.scala → ...controllers/DocumentationController.scala b/...controllers/DocumentationController.scala → ...controllers/DocumentationController.scala
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.controllers
+package controllers
 
 import javax.inject.{Inject, Singleton}
-import controllers.Assets
 import play.api.http.HttpErrorHandler
 import play.api.mvc.{Action, AnyContent, ControllerComponents}
-import uk.gov.hmrc.openidconnect.userinfo.config.{APIAccessVersions, AppContext}
-import uk.gov.hmrc.openidconnect.userinfo.views._
+import config.{APIAccessVersions, AppContext}
+import views._
 
 import scala.language.dynamics
 

diff --git a/...userinfo/controllers/ErrorResponses.scala → app/controllers/ErrorResponses.scala b/...userinfo/controllers/ErrorResponses.scala → app/controllers/ErrorResponses.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.controllers
+package controllers
 
 import play.mvc.Http.Status._
 

diff --git a/...info/controllers/UserInfoController.scala → app/controllers/UserInfoController.scala b/...info/controllers/UserInfoController.scala → app/controllers/UserInfoController.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.controllers
+package controllers
 
 import javax.inject.{Inject, Singleton}
 import com.google.inject.name.Named
@@ -23,8 +23,8 @@ import play.api.libs.json.Json
 import play.api.mvc.{AnyContent, BodyParser, ControllerComponents}
 import uk.gov.hmrc.api.controllers.HeaderValidator
 import uk.gov.hmrc.http.{BadRequestException, Upstream4xxResponse, Upstream5xxResponse}
-import uk.gov.hmrc.openidconnect.userinfo.config.AppContext
-import uk.gov.hmrc.openidconnect.userinfo.services.{LiveUserInfoService, SandboxUserInfoService, UserInfoService}
+import config.AppContext
+import services.{LiveUserInfoService, SandboxUserInfoService, UserInfoService}
 import uk.gov.hmrc.play.bootstrap.controller.BackendBaseController
 
 import scala.concurrent.ExecutionContext

diff --git a/...onnect/userinfo/controllers/package.scala → app/controllers/package.scala b/...onnect/userinfo/controllers/package.scala → app/controllers/package.scala
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo
-
 import play.api.libs.json.{JsValue, Json, Writes}
 
 package object controllers {

diff --git a/...rs/testOnly/FeatureSwitchController.scala → ...rs/testOnly/FeatureSwitchController.scala b/...rs/testOnly/FeatureSwitchController.scala → ...rs/testOnly/FeatureSwitchController.scala
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.controllers.testOnly
+package controllers.testOnly
 
 import javax.inject.{Inject, Singleton}
 import play.api.libs.json.Json
 import play.api.mvc.{Action, ControllerComponents}
-import uk.gov.hmrc.openidconnect.userinfo.config.{FeatureSwitch, UserInfoFeatureSwitches}
+import config.{FeatureSwitch, UserInfoFeatureSwitches}
 import uk.gov.hmrc.play.bootstrap.controller.BackendController
 
 import scala.concurrent.ExecutionContext.Implicits.global

diff --git a/...ect/userinfo/data/UserInfoGenerator.scala → app/data/UserInfoGenerator.scala b/...ect/userinfo/data/UserInfoGenerator.scala → app/data/UserInfoGenerator.scala
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.data
+package data
 
 import javax.inject.Singleton
 import org.joda.time._
 import org.scalacheck.Gen
 import uk.gov.hmrc.auth.core.{Enrolment, EnrolmentIdentifier}
-import uk.gov.hmrc.openidconnect.userinfo.config.UserInfoFeatureSwitches
-import uk.gov.hmrc.openidconnect.userinfo.domain.{Address, GovernmentGatewayDetails, Mdtp, UserInfo}
+import config.UserInfoFeatureSwitches
+import domain.{Address, GovernmentGatewayDetails, Mdtp, UserInfo}
 
 @Singleton
 class UserInfoGenerator {

diff --git a/...nnect/userinfo/domain/APIDefinition.scala → app/domain/APIDefinition.scala b/...nnect/userinfo/domain/APIDefinition.scala → app/domain/APIDefinition.scala
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.domain
+package domain
 
 case class APIAccess(`type`: String, allowlistedApplicationIds: Option[Seq[String]])
diff --git a/...idconnect/userinfo/domain/Authority.scala → app/domain/Authority.scala b/...idconnect/userinfo/domain/Authority.scala → app/domain/Authority.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.domain
+package domain
 
 case class Authority(credId: String,
                      nino:   Option[String] = None)
diff --git a/...idconnect/userinfo/domain/Enrolment.scala → app/domain/Enrolment.scala b/...idconnect/userinfo/domain/Enrolment.scala → app/domain/Enrolment.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.domain
+package domain
 
 import uk.gov.hmrc.auth.core.Enrolment
 

diff --git a/...nfo/domain/GovernmentGatewayDetails.scala → app/domain/GovernmentGatewayDetails.scala b/...nfo/domain/GovernmentGatewayDetails.scala → app/domain/GovernmentGatewayDetails.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.domain
+package domain
 
 case class GovernmentGatewayDetails(
     user_id:              Option[String],

diff --git a/...erinfo/domain/NinoNotFoundException.scala → app/domain/NinoNotFoundException.scala b/...erinfo/domain/NinoNotFoundException.scala → app/domain/NinoNotFoundException.scala
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.domain
+package domain
 
 case class NinoNotFoundException() extends Exception
diff --git a/...connect/userinfo/domain/UserDetails.scala → app/domain/UserDetails.scala b/...connect/userinfo/domain/UserDetails.scala → app/domain/UserDetails.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.domain
+package domain
 
 import org.joda.time.LocalDate
 import uk.gov.hmrc.auth.core.retrieve.{GatewayInformation, MdtpInformation}

diff --git a/...nidconnect/userinfo/domain/UserInfo.scala → app/domain/UserInfo.scala b/...nidconnect/userinfo/domain/UserInfo.scala → app/domain/UserInfo.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.domain
+package domain
 
 import org.joda.time.LocalDate
 import uk.gov.hmrc.auth.core.Enrolment

diff --git a/...enidconnect/userinfo/domain/package.scala → app/domain/package.scala b/...enidconnect/userinfo/domain/package.scala → app/domain/package.scala
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo
-
 import org.joda.time._
 import play.api.libs.json._
 import uk.gov.hmrc.auth.core.retrieve.{GatewayInformation, ItmpAddress, ItmpName, MdtpInformation}

diff --git a/...info/filters/MicroserviceAuthFilter.scala → app/filters/MicroserviceAuthFilter.scala b/...info/filters/MicroserviceAuthFilter.scala → app/filters/MicroserviceAuthFilter.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.filters
+package filters
 
 import akka.stream.Materializer
 import javax.inject.{Inject, Singleton}
@@ -23,8 +23,8 @@ import play.api.libs.json.Json
 import play.api.mvc.{Filter, RequestHeader, Result, Results}
 import play.api.routing.Router
 import uk.gov.hmrc.auth.core.{AuthorisationException, AuthorisedFunctions}
-import uk.gov.hmrc.openidconnect.userinfo.connectors.AuthConnector
-import uk.gov.hmrc.openidconnect.userinfo.controllers.ErrorUnauthorized
+import connectors.AuthConnector
+import controllers.ErrorUnauthorized
 import uk.gov.hmrc.play.HeaderCarrierConverter
 
 import scala.concurrent.{ExecutionContext, Future}

diff --git a/...serinfo/filters/MicroserviceFilters.scala → app/filters/MicroserviceFilters.scala b/...serinfo/filters/MicroserviceFilters.scala → app/filters/MicroserviceFilters.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.filters
+package filters
 
 import javax.inject.{Inject, Singleton}
 import com.kenshoo.play.metrics.MetricsFilter

diff --git a/...nect/userinfo/handlers/ErrorHandler.scala → app/handlers/ErrorHandler.scala b/...nect/userinfo/handlers/ErrorHandler.scala → app/handlers/ErrorHandler.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.handlers
+package handlers
 
 import javax.inject.{Inject, Singleton}
 import com.google.inject.Provider
@@ -24,7 +24,7 @@ import play.api.mvc.Results.Status
 import play.api.mvc.{RequestHeader, Result}
 import play.api.routing.Router
 import play.api.{Configuration, Environment, OptionalSourceMapper}
-import uk.gov.hmrc.openidconnect.userinfo.controllers.{ErrorBadGateway, ErrorUnauthorized}
+import controllers.{ErrorBadGateway, ErrorUnauthorized}
 import scala.concurrent.{ExecutionContext, Future}
 
 @Singleton

diff --git a/...t/userinfo/services/UserInfoService.scala → app/services/UserInfoService.scala b/...t/userinfo/services/UserInfoService.scala → app/services/UserInfoService.scala
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.services
+package services
 
 import javax.inject.{Inject, Named, Singleton}
 
 import org.scalacheck.Gen
 import uk.gov.hmrc.auth.core.Enrolments
 import uk.gov.hmrc.http.logging.Authorization
 import uk.gov.hmrc.http.{BadRequestException, HeaderCarrier, UnauthorizedException}
-import uk.gov.hmrc.openidconnect.userinfo.connectors._
-import uk.gov.hmrc.openidconnect.userinfo.controllers.{Version, Version_1_0, Version_1_1}
-import uk.gov.hmrc.openidconnect.userinfo.data.UserInfoGenerator
-import uk.gov.hmrc.openidconnect.userinfo.domain._
+import connectors._
+import controllers.{Version, Version_1_0, Version_1_1}
+import data.UserInfoGenerator
+import domain._
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future

diff --git a/...erinfo/services/UserInfoTransformer.scala → app/services/UserInfoTransformer.scala b/...erinfo/services/UserInfoTransformer.scala → app/services/UserInfoTransformer.scala
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package uk.gov.hmrc.openidconnect.userinfo.services
+package services
 
 import javax.inject.Singleton
 import org.joda.time.LocalDate
 import uk.gov.hmrc.auth.core.Enrolments
 import uk.gov.hmrc.auth.core.retrieve.ItmpAddress
-import uk.gov.hmrc.openidconnect.userinfo.config.UserInfoFeatureSwitches
-import uk.gov.hmrc.openidconnect.userinfo.domain._
+import config.UserInfoFeatureSwitches
+import domain._
 
 @Singleton
 class UserInfoTransformer {

diff --git a/...nnect/userinfo/views/definition.scala.txt → app/views/definition.scala.txt b/...nnect/userinfo/views/definition.scala.txt → app/views/definition.scala.txt
@@ -1,4 +1,4 @@
-@import uk.gov.hmrc.openidconnect.userinfo.config.APIAccessConfig
+@import config.APIAccessConfig
 @import play.api.libs.json.Json
 
 @(versions: List[APIAccessConfig])