package-refactor: move formProfiders to profile package

hmrc · Nov 6, 2024 · 0cb1e89 · 0cb1e89
1 parent 7f26024
commit 0cb1e89
Show file tree

Hide file tree

Showing 34 changed files with 48 additions and 45 deletions.
diff --git a/app/controllers/profile/HasNiphlController.scala b/app/controllers/profile/HasNiphlController.scala
@@ -19,7 +19,7 @@ package controllers.profile
 import connectors.TraderProfileConnector
 import controllers.BaseController
 import controllers.actions._
-import forms.HasNiphlFormProvider
+import forms.profile.HasNiphlFormProvider
 import models.Mode
 import navigation.ProfileNavigator
 import pages.profile.{HasNiphlPage, HasNiphlUpdatePage}

diff --git a/app/controllers/profile/HasNirmsController.scala b/app/controllers/profile/HasNirmsController.scala
@@ -19,7 +19,7 @@ package controllers.profile
 import connectors.TraderProfileConnector
 import controllers.BaseController
 import controllers.actions._
-import forms.HasNirmsFormProvider
+import forms.profile.HasNirmsFormProvider
 import models.Mode
 import navigation.ProfileNavigator
 import pages.profile.{HasNirmsPage, HasNirmsUpdatePage}

diff --git a/app/controllers/profile/NewUkimsNumberController.scala b/app/controllers/profile/NewUkimsNumberController.scala
@@ -19,7 +19,7 @@ package controllers.profile
 import connectors.TraderProfileConnector
 import controllers.BaseController
 import controllers.actions._
-import forms.UkimsNumberFormProvider
+import forms.profile.UkimsNumberFormProvider
 import models.Mode
 import navigation.Navigator
 import pages.NewUkimsNumberPage

diff --git a/app/controllers/profile/NiphlNumberController.scala b/app/controllers/profile/NiphlNumberController.scala
@@ -19,7 +19,7 @@ package controllers.profile
 import connectors.TraderProfileConnector
 import controllers.BaseController
 import controllers.actions._
-import forms.NiphlNumberFormProvider
+import forms.profile.NiphlNumberFormProvider
 import models.Mode
 import navigation.ProfileNavigator
 import pages.profile.{HasNiphlUpdatePage, NiphlNumberPage, NiphlNumberUpdatePage}

diff --git a/app/controllers/profile/NirmsNumberController.scala b/app/controllers/profile/NirmsNumberController.scala
@@ -19,7 +19,7 @@ package controllers.profile
 import connectors.TraderProfileConnector
 import controllers.BaseController
 import controllers.actions._
-import forms.NirmsNumberFormProvider
+import forms.profile.NirmsNumberFormProvider
 import models.Mode
 import navigation.ProfileNavigator
 import pages.profile.{HasNirmsUpdatePage, NirmsNumberPage, NirmsNumberUpdatePage}

diff --git a/app/controllers/profile/RemoveNiphlController.scala b/app/controllers/profile/RemoveNiphlController.scala
@@ -19,7 +19,7 @@ package controllers.profile
 import connectors.TraderProfileConnector
 import controllers.actions._
 import controllers.{BaseController, routes}
-import forms.RemoveNiphlFormProvider
+import forms.profile.RemoveNiphlFormProvider
 import models.NormalMode
 import navigation.ProfileNavigator
 import pages.profile.{NiphlNumberUpdatePage, RemoveNiphlPage}

diff --git a/app/controllers/profile/RemoveNirmsController.scala b/app/controllers/profile/RemoveNirmsController.scala
@@ -19,7 +19,7 @@ package controllers.profile
 import connectors.TraderProfileConnector
 import controllers.actions._
 import controllers.{BaseController, routes}
-import forms.RemoveNirmsFormProvider
+import forms.profile.RemoveNirmsFormProvider
 import models.NormalMode
 import navigation.ProfileNavigator
 import pages.profile.{NirmsNumberUpdatePage, RemoveNirmsPage}

diff --git a/app/controllers/profile/UkimsNumberController.scala b/app/controllers/profile/UkimsNumberController.scala
@@ -19,7 +19,7 @@ package controllers.profile
 import connectors.TraderProfileConnector
 import controllers.BaseController
 import controllers.actions._
-import forms.UkimsNumberFormProvider
+import forms.profile.UkimsNumberFormProvider
 import models.Mode
 import navigation.ProfileNavigator
 import pages.profile.{UkimsNumberPage, UkimsNumberUpdatePage}

diff --git a/app/controllers/profile/UseExistingUkimsNumberController.scala b/app/controllers/profile/UseExistingUkimsNumberController.scala
@@ -18,7 +18,7 @@ package controllers.profile
 
 import controllers.BaseController
 import controllers.actions._
-import forms.UseExistingUkimsNumberFormProvider
+import forms.profile.UseExistingUkimsNumberFormProvider
 import models.NormalMode
 import navigation.ProfileNavigator
 import pages.profile.{UkimsNumberPage, UseExistingUkimsNumberPage}

diff --git a/app/forms/HasNiphlFormProvider.scala → app/forms/profile/HasNiphlFormProvider.scala b/app/forms/HasNiphlFormProvider.scala → app/forms/profile/HasNiphlFormProvider.scala
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package forms
-
-import javax.inject.Inject
+package forms.profile
 
 import forms.mappings.Mappings
 import play.api.data.Form
 
+import javax.inject.Inject
+
 class HasNiphlFormProvider @Inject() extends Mappings {
 
   def apply(): Form[Boolean] =

diff --git a/app/forms/HasNirmsFormProvider.scala → app/forms/profile/HasNirmsFormProvider.scala b/app/forms/HasNirmsFormProvider.scala → app/forms/profile/HasNirmsFormProvider.scala
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package forms
-
-import javax.inject.Inject
+package forms.profile
 
 import forms.mappings.Mappings
 import play.api.data.Form
 
+import javax.inject.Inject
+
 class HasNirmsFormProvider @Inject() extends Mappings {
 
   def apply(): Form[Boolean] =

diff --git a/app/forms/NiphlNumberFormProvider.scala → ...rms/profile/NiphlNumberFormProvider.scala b/app/forms/NiphlNumberFormProvider.scala → ...rms/profile/NiphlNumberFormProvider.scala
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
-import javax.inject.Inject
 import forms.mappings.Mappings
 import forms.mappings.helpers.FormatAnswers.toUppercaseAndRemoveSpacesAndHyphens
 import models.StringFieldRegex
 import play.api.data.Form
 
+import javax.inject.Inject
+
 class NiphlNumberFormProvider @Inject() extends Mappings {
 
   def apply(): Form[String] =

diff --git a/app/forms/NirmsNumberFormProvider.scala → ...rms/profile/NirmsNumberFormProvider.scala b/app/forms/NirmsNumberFormProvider.scala → ...rms/profile/NirmsNumberFormProvider.scala
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
-import javax.inject.Inject
 import forms.mappings.Mappings
 import forms.mappings.helpers.FormatAnswers.{addHyphensToNirms, toUppercaseAndRemoveSpacesAndHyphens}
 import models.StringFieldRegex
 import play.api.data.Form
 
+import javax.inject.Inject
+
 class NirmsNumberFormProvider @Inject() extends Mappings {
 
   def apply(): Form[String] =

diff --git a/app/forms/RemoveNiphlFormProvider.scala → ...rms/profile/RemoveNiphlFormProvider.scala b/app/forms/RemoveNiphlFormProvider.scala → ...rms/profile/RemoveNiphlFormProvider.scala
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package forms
-
-import javax.inject.Inject
+package forms.profile
 
 import forms.mappings.Mappings
 import play.api.data.Form
 
+import javax.inject.Inject
+
 class RemoveNiphlFormProvider @Inject() extends Mappings {
 
   def apply(): Form[Boolean] =

diff --git a/app/forms/RemoveNirmsFormProvider.scala → ...rms/profile/RemoveNirmsFormProvider.scala b/app/forms/RemoveNirmsFormProvider.scala → ...rms/profile/RemoveNirmsFormProvider.scala
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package forms
-
-import javax.inject.Inject
+package forms.profile
 
 import forms.mappings.Mappings
 import play.api.data.Form
 
+import javax.inject.Inject
+
 class RemoveNirmsFormProvider @Inject() extends Mappings {
 
   def apply(): Form[Boolean] =

diff --git a/app/forms/UkimsNumberFormProvider.scala → ...rms/profile/UkimsNumberFormProvider.scala b/app/forms/UkimsNumberFormProvider.scala → ...rms/profile/UkimsNumberFormProvider.scala
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
-import javax.inject.Inject
 import forms.mappings.Mappings
 import forms.mappings.helpers.FormatAnswers.toUppercaseAndRemoveSpacesAndHyphens
 import models.StringFieldRegex
 import play.api.data.Form
 
+import javax.inject.Inject
+
 class UkimsNumberFormProvider @Inject() extends Mappings {
 
   def apply(): Form[String] =

diff --git a/.../UseExistingUkimsNumberFormProvider.scala → .../UseExistingUkimsNumberFormProvider.scala b/.../UseExistingUkimsNumberFormProvider.scala → .../UseExistingUkimsNumberFormProvider.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
 import forms.mappings.Mappings
 import play.api.data.Form

diff --git a/test/controllers/profile/HasNiphlControllerSpec.scala b/test/controllers/profile/HasNiphlControllerSpec.scala
@@ -20,7 +20,7 @@ import base.SpecBase
 import base.TestConstants.{testEori, userAnswersId}
 import connectors.TraderProfileConnector
 import controllers.routes
-import forms.HasNiphlFormProvider
+import forms.profile.HasNiphlFormProvider
 import models.{NormalMode, TraderProfile, UserAnswers}
 import navigation.{FakeProfileNavigator, ProfileNavigator}
 import org.mockito.ArgumentMatchers.{any, eq => eqTo}

diff --git a/test/controllers/profile/HasNirmsControllerSpec.scala b/test/controllers/profile/HasNirmsControllerSpec.scala
@@ -20,7 +20,7 @@ import base.SpecBase
 import base.TestConstants.{testEori, userAnswersId}
 import connectors.TraderProfileConnector
 import controllers.routes
-import forms.HasNirmsFormProvider
+import forms.profile.HasNirmsFormProvider
 import models.{NormalMode, TraderProfile, UserAnswers}
 import navigation.{FakeProfileNavigator, ProfileNavigator}
 import org.mockito.ArgumentMatchers.{any, eq => eqTo}

diff --git a/test/controllers/profile/NewUkimsNumberControllerSpec.scala b/test/controllers/profile/NewUkimsNumberControllerSpec.scala
@@ -20,7 +20,7 @@ import base.SpecBase
 import base.TestConstants.{testEori, userAnswersId}
 import connectors.TraderProfileConnector
 import controllers.routes
-import forms.UkimsNumberFormProvider
+import forms.profile.UkimsNumberFormProvider
 import models.{NormalMode, TraderProfile, UserAnswers}
 import navigation.{FakeNavigator, Navigator}
 import org.mockito.ArgumentMatchers.{any, eq => eqTo}

diff --git a/test/controllers/profile/NiphlNumberControllerSpec.scala b/test/controllers/profile/NiphlNumberControllerSpec.scala
@@ -20,7 +20,7 @@ import base.SpecBase
 import base.TestConstants.{testEori, userAnswersId}
 import connectors.TraderProfileConnector
 import controllers.routes
-import forms.NiphlNumberFormProvider
+import forms.profile.NiphlNumberFormProvider
 import models.{NormalMode, TraderProfile, UserAnswers}
 import navigation.{FakeProfileNavigator, ProfileNavigator}
 import org.apache.pekko.Done

diff --git a/test/controllers/profile/NirmsNumberControllerSpec.scala b/test/controllers/profile/NirmsNumberControllerSpec.scala
@@ -20,7 +20,7 @@ import base.SpecBase
 import base.TestConstants.{testEori, userAnswersId}
 import connectors.TraderProfileConnector
 import controllers.routes
-import forms.NirmsNumberFormProvider
+import forms.profile.NirmsNumberFormProvider
 import models.{NormalMode, TraderProfile, UserAnswers}
 import navigation.{FakeProfileNavigator, ProfileNavigator}
 import org.mockito.ArgumentMatchers.{any, eq => eqTo}

diff --git a/test/controllers/profile/RemoveNiphlControllerSpec.scala b/test/controllers/profile/RemoveNiphlControllerSpec.scala
@@ -20,7 +20,7 @@ import base.SpecBase
 import base.TestConstants.{testEori, userAnswersId}
 import connectors.TraderProfileConnector
 import controllers.routes
-import forms.RemoveNiphlFormProvider
+import forms.profile.RemoveNiphlFormProvider
 import models.{TraderProfile, UserAnswers}
 import navigation.{FakeProfileNavigator, ProfileNavigator}
 import org.mockito.ArgumentCaptor

diff --git a/test/controllers/profile/RemoveNirmsControllerSpec.scala b/test/controllers/profile/RemoveNirmsControllerSpec.scala
@@ -20,7 +20,7 @@ import base.SpecBase
 import base.TestConstants.{testEori, userAnswersId}
 import connectors.TraderProfileConnector
 import controllers.routes
-import forms.RemoveNirmsFormProvider
+import forms.profile.RemoveNirmsFormProvider
 import models.{TraderProfile, UserAnswers}
 import navigation.{FakeProfileNavigator, ProfileNavigator}
 import org.mockito.ArgumentCaptor

diff --git a/test/controllers/profile/UkimsNumberControllerSpec.scala b/test/controllers/profile/UkimsNumberControllerSpec.scala
@@ -20,7 +20,7 @@ import base.SpecBase
 import base.TestConstants.{testEori, userAnswersId}
 import connectors.TraderProfileConnector
 import controllers.routes
-import forms.UkimsNumberFormProvider
+import forms.profile.UkimsNumberFormProvider
 import models.{CheckMode, NormalMode, TraderProfile, UserAnswers}
 import navigation.{FakeProfileNavigator, ProfileNavigator}
 import org.mockito.ArgumentMatchers.{any, eq => eqTo}

diff --git a/test/controllers/profile/UseExistingUkimsNumberControllerSpec.scala b/test/controllers/profile/UseExistingUkimsNumberControllerSpec.scala
@@ -20,7 +20,7 @@ import base.SpecBase
 import base.TestConstants.userAnswersId
 import connectors.TraderProfileConnector
 import controllers.routes
-import forms.UseExistingUkimsNumberFormProvider
+import forms.profile.UseExistingUkimsNumberFormProvider
 import models.UserAnswers
 import navigation.{FakeProfileNavigator, ProfileNavigator}
 import org.mockito.ArgumentMatchers.any

diff --git a/test/forms/HasNiphlFormProviderSpec.scala → ...ms/profile/HasNiphlFormProviderSpec.scala b/test/forms/HasNiphlFormProviderSpec.scala → ...ms/profile/HasNiphlFormProviderSpec.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
 import forms.behaviours.BooleanFieldBehaviours
 import play.api.data.FormError

diff --git a/test/forms/HasNirmsFormProviderSpec.scala → ...ms/profile/HasNirmsFormProviderSpec.scala b/test/forms/HasNirmsFormProviderSpec.scala → ...ms/profile/HasNirmsFormProviderSpec.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
 import forms.behaviours.BooleanFieldBehaviours
 import play.api.data.FormError

diff --git a/test/forms/NiphlNumberFormProviderSpec.scala → ...profile/NiphlNumberFormProviderSpec.scala b/test/forms/NiphlNumberFormProviderSpec.scala → ...profile/NiphlNumberFormProviderSpec.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
 import forms.behaviours.StringFieldBehaviours
 import generators.NiphlNumberGenerator

diff --git a/test/forms/NirmsNumberFormProviderSpec.scala → ...profile/NirmsNumberFormProviderSpec.scala b/test/forms/NirmsNumberFormProviderSpec.scala → ...profile/NirmsNumberFormProviderSpec.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
 import forms.behaviours.StringFieldBehaviours
 import org.scalacheck.Gen

diff --git a/test/forms/RemoveNiphlFormProviderSpec.scala → ...profile/RemoveNiphlFormProviderSpec.scala b/test/forms/RemoveNiphlFormProviderSpec.scala → ...profile/RemoveNiphlFormProviderSpec.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
 import forms.behaviours.BooleanFieldBehaviours
 import play.api.data.FormError

diff --git a/test/forms/RemoveNirmsFormProviderSpec.scala → ...profile/RemoveNirmsFormProviderSpec.scala b/test/forms/RemoveNirmsFormProviderSpec.scala → ...profile/RemoveNirmsFormProviderSpec.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
 import forms.behaviours.BooleanFieldBehaviours
 import play.api.data.FormError

diff --git a/test/forms/UkimsNumberFormProviderSpec.scala → ...profile/UkimsNumberFormProviderSpec.scala b/test/forms/UkimsNumberFormProviderSpec.scala → ...profile/UkimsNumberFormProviderSpec.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
 import forms.behaviours.StringFieldBehaviours
 import org.scalacheck.Gen

diff --git a/...ExistingUkimsNumberFormProviderSpec.scala → ...ExistingUkimsNumberFormProviderSpec.scala b/...ExistingUkimsNumberFormProviderSpec.scala → ...ExistingUkimsNumberFormProviderSpec.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package forms
+package forms.profile
 
 import forms.behaviours.BooleanFieldBehaviours
 import play.api.data.FormError