Merge pull request #1732 from scala-steward-org/topic/rm-http4s-pkg

Remove http4s packag/prefix from VCSApiAlg implementations

Author: fthomas

docs/running.md

@@ -83,7 +83,7 @@ example1.realm=Example Realm
 
 ### Running locally from sbt
 
-#### Sample run for Gitlab
+#### Sample run for GitLab
 
 ```
 sbt
@@ -130,14 +130,14 @@ docker run -v $PWD:/opt/scala-steward \
 There is an article on how they run Scala Steward on-premise at Avast:
 * [Running Scala Steward On-premise](https://engineering.avast.io/running-scala-steward-on-premise)
 
-#### Gitlab
+#### GitLab
 
-The following describes a setup using Gitlab Docker runner, which you have to setup seperately.
+The following describes a setup using GitLab Docker runner, which you have to setup seperately.
 
-1. create a "scalasteward" user in Gitlab
+1. create a "scalasteward" user in GitLab
 2. assign that user "Developer" permissions in every project that should be managed by Scala Steward
 3. login as that user and create a Personal Access Token with `api`, `read_repository` and `write_repository` scopes
-4. create a project and add the following Gitlab CI config
+4. create a project and add the following GitLab CI config
 
 ```yaml
 check:

modules/core/src/main/scala/org/scalasteward/core/application/SupportedVCS.scala

@@ -25,17 +25,17 @@ sealed trait SupportedVCS {
     case Bitbucket       => "bitbucket"
     case BitbucketServer => "bitbucket-server"
     case GitHub          => "github"
-    case Gitlab          => "gitlab"
+    case GitLab          => "gitlab"
   }
 }
 
 object SupportedVCS {
   case object Bitbucket extends SupportedVCS
   case object BitbucketServer extends SupportedVCS
   case object GitHub extends SupportedVCS
-  case object Gitlab extends SupportedVCS
+  case object GitLab extends SupportedVCS
 
-  val all = List(Bitbucket, BitbucketServer, GitHub, Gitlab)
+  val all = List(Bitbucket, BitbucketServer, GitHub, GitLab)
 
   def parse(s: String): Either[String, SupportedVCS] =
     all.find(_.asString === s) match {

modules/core/src/main/scala/org/scalasteward/core/nurture/NurtureAlg.scala

@@ -36,7 +36,6 @@ import org.scalasteward.core.util.{BracketThrow, HttpExistenceClient}
 import org.scalasteward.core.vcs.data.{NewPullRequestData, PullRequestState, Repo, RepoOut}
 import org.scalasteward.core.vcs.{VCSApiAlg, VCSExtraAlg, VCSRepoAlg}
 import org.scalasteward.core.{git, util, vcs}
-
 import scala.util.control.NonFatal
 
 final class NurtureAlg[F[_]](config: Config)(implicit

modules/core/src/main/scala/org/scalasteward/core/util/HttpJsonClient.scala

@@ -20,10 +20,9 @@ import cats.effect.Sync
 import cats.syntax.all._
 import io.circe.{Decoder, Encoder}
 import org.http4s.Method.{GET, PATCH, POST, PUT}
+import org.http4s._
 import org.http4s.circe.{jsonEncoderOf, jsonOf}
 import org.http4s.client.Client
-import org.http4s._
-
 import scala.util.control.NoStackTrace
 
 final class HttpJsonClient[F[_]: Sync](implicit

modules/core/src/main/scala/org/scalasteward/core/vcs/VCSExtraAlg.scala

@@ -54,7 +54,7 @@ object VCSExtraAlg {
             extractIntAfter(uri.path, "pull")
           case SupportedVCS.Bitbucket | SupportedVCS.BitbucketServer =>
             extractIntAfter(uri.path, "pullrequests")
-          case SupportedVCS.Gitlab =>
+          case SupportedVCS.GitLab =>
             extractIntAfter(uri.path, "merge_requests")
         }
       }

modules/core/src/main/scala/org/scalasteward/core/vcs/VCSSelection.scala

@@ -18,29 +18,29 @@ package org.scalasteward.core.vcs
 
 import io.chrisdavenport.log4cats.Logger
 import org.scalasteward.core.application.Config
-import org.scalasteward.core.application.SupportedVCS.{Bitbucket, BitbucketServer, GitHub, Gitlab}
+import org.scalasteward.core.application.SupportedVCS.{Bitbucket, BitbucketServer, GitHub, GitLab}
 import org.scalasteward.core.util.{HttpJsonClient, MonadThrow}
-import org.scalasteward.core.vcs.bitbucket.http4s.Http4sBitbucketApiAlg
-import org.scalasteward.core.vcs.bitbucketserver.http4s.Http4sBitbucketServerApiAlg
+import org.scalasteward.core.vcs.bitbucket.BitbucketApiAlg
+import org.scalasteward.core.vcs.bitbucketserver.BitbucketServerApiAlg
 import org.scalasteward.core.vcs.data.AuthenticatedUser
-import org.scalasteward.core.vcs.github.http4s.Http4sGitHubApiAlg
-import org.scalasteward.core.vcs.gitlab.http4s.Http4sGitLabApiAlg
+import org.scalasteward.core.vcs.github.GitHubApiAlg
+import org.scalasteward.core.vcs.gitlab.GitLabApiAlg
 
 final class VCSSelection[F[_]](implicit
     client: HttpJsonClient[F],
     user: AuthenticatedUser,
     logger: Logger[F],
     F: MonadThrow[F]
 ) {
-  private def github(config: Config): Http4sGitHubApiAlg[F] = {
-    import org.scalasteward.core.vcs.github.http4s.authentication.addCredentials
+  private def github(config: Config): GitHubApiAlg[F] = {
+    import org.scalasteward.core.vcs.github.authentication.addCredentials
 
-    new Http4sGitHubApiAlg[F](config.vcsApiHost, _ => addCredentials(user))
+    new GitHubApiAlg[F](config.vcsApiHost, _ => addCredentials(user))
   }
 
-  private def gitlab(config: Config): Http4sGitLabApiAlg[F] = {
-    import org.scalasteward.core.vcs.gitlab.http4s.authentication.addCredentials
-    new Http4sGitLabApiAlg[F](
+  private def gitlab(config: Config): GitLabApiAlg[F] = {
+    import org.scalasteward.core.vcs.gitlab.authentication.addCredentials
+    new GitLabApiAlg[F](
       config.vcsApiHost,
       user,
       _ => addCredentials(user),
@@ -49,16 +49,16 @@ final class VCSSelection[F[_]](implicit
     )
   }
 
-  private def bitbucket(config: Config): Http4sBitbucketApiAlg[F] = {
-    import org.scalasteward.core.vcs.bitbucket.http4s.authentication.addCredentials
+  private def bitbucket(config: Config): BitbucketApiAlg[F] = {
+    import org.scalasteward.core.vcs.bitbucket.authentication.addCredentials
 
-    new Http4sBitbucketApiAlg(config.vcsApiHost, user, _ => addCredentials(user), config.doNotFork)
+    new BitbucketApiAlg(config.vcsApiHost, user, _ => addCredentials(user), config.doNotFork)
   }
 
-  private def bitbucketServer(config: Config): Http4sBitbucketServerApiAlg[F] = {
-    import org.scalasteward.core.vcs.bitbucket.http4s.authentication.addCredentials
+  private def bitbucketServer(config: Config): BitbucketServerApiAlg[F] = {
+    import org.scalasteward.core.vcs.bitbucket.authentication.addCredentials
 
-    new Http4sBitbucketServerApiAlg[F](
+    new BitbucketServerApiAlg[F](
       config.vcsApiHost,
       _ => addCredentials(user),
       config.bitbucketServerUseDefaultReviewers
@@ -68,7 +68,7 @@ final class VCSSelection[F[_]](implicit
   def getAlg(config: Config): VCSApiAlg[F] =
     config.vcsType match {
       case GitHub          => github(config)
-      case Gitlab          => gitlab(config)
+      case GitLab          => gitlab(config)
       case Bitbucket       => bitbucket(config)
       case BitbucketServer => bitbucketServer(config)
     }

…ucket/http4s/Http4sBitbucketApiAlg.scala …core/vcs/bitbucket/BitbucketApiAlg.scalamodules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/Http4sBitbucketApiAlg.scala renamed to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/BitbucketApiAlg.scala modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/Http4sBitbucketApiAlg.scala renamed to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/BitbucketApiAlg.scala

@@ -14,18 +14,17 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.vcs.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket
 
 import cats.syntax.all._
 import org.http4s.{Request, Status, Uri}
 import org.scalasteward.core.git.Branch
 import org.scalasteward.core.util.{HttpJsonClient, MonadThrow, UnexpectedResponse}
 import org.scalasteward.core.vcs.VCSApiAlg
-import org.scalasteward.core.vcs.bitbucket.Url
-import org.scalasteward.core.vcs.bitbucket.http4s.json._
+import org.scalasteward.core.vcs.bitbucket.json._
 import org.scalasteward.core.vcs.data._
 
-class Http4sBitbucketApiAlg[F[_]](
+class BitbucketApiAlg[F[_]](
     bitbucketApiHost: Uri,
     user: AuthenticatedUser,
     modify: Repo => Request[F] => F[Request[F]],

…et/http4s/CreatePullRequestRequest.scala …bitbucket/CreatePullRequestRequest.scalamodules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/CreatePullRequestRequest.scala renamed to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/CreatePullRequestRequest.scala modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/CreatePullRequestRequest.scala renamed to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/CreatePullRequestRequest.scala

@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.vcs.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket
 
 import io.circe.{Encoder, Json}
 import org.scalasteward.core.git.Branch
 import org.scalasteward.core.vcs.data.Repo
 
-private[http4s] case class CreatePullRequestRequest(
+private[bitbucket] case class CreatePullRequestRequest(
     title: String,
     sourceBranch: Branch,
     sourceRepo: Repo,
     destinationBranch: Branch,
     description: String
 )
 
-private[http4s] object CreatePullRequestRequest {
+private[bitbucket] object CreatePullRequestRequest {
   implicit val encoder: Encoder[CreatePullRequestRequest] = Encoder.instance { d =>
     Json.obj(
       ("title", Json.fromString(d.title)),

…ard/core/vcs/bitbucket/http4s/Page.scala …alasteward/core/vcs/bitbucket/Page.scalamodules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/Page.scala renamed to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/Page.scala modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/Page.scala renamed to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/Page.scala

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.vcs.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket
 
 import io.circe.Decoder
 
-final private[http4s] case class Page[A](values: List[A])
+final private[bitbucket] case class Page[A](values: List[A])
 
-private[http4s] object Page {
+private[bitbucket] object Page {
   implicit def pageDecoder[A: Decoder]: Decoder[Page[A]] =
     Decoder.instance { c =>
       c.downField("values").as[List[A]].map(Page(_))

…itbucket/http4s/RepositoryResponse.scala …e/vcs/bitbucket/RepositoryResponse.scalamodules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/RepositoryResponse.scala renamed to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/RepositoryResponse.scala modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/http4s/RepositoryResponse.scala renamed to modules/core/src/main/scala/org/scalasteward/core/vcs/bitbucket/RepositoryResponse.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.vcs.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket
 
 import cats.syntax.all._
 import io.circe.{ACursor, Decoder, DecodingFailure, Json}
@@ -24,15 +24,15 @@ import org.scalasteward.core.util.uri._
 import org.scalasteward.core.vcs.data.{Repo, UserOut}
 import scala.annotation.tailrec
 
-final private[http4s] case class RepositoryResponse(
+final private[bitbucket] case class RepositoryResponse(
     name: String,
     mainBranch: Branch,
     owner: UserOut,
     httpsCloneUrl: Uri,
     parent: Option[Repo]
 )
 
-private[http4s] object RepositoryResponse {
+private[bitbucket] object RepositoryResponse {
   implicit private val repoDecoder: Decoder[Repo] = Decoder.instance { c =>
     c.as[String].map(_.split('/')).flatMap { parts =>
       parts match {