Move common packages into bitbucket package and remove println

jllopes · jllopes · commit a55c2558db7c · 2018-10-19T18:16:47.000+01:00
diff --git a/src/main/scala/com/codacy/client/bitbucket/client/Authentication.scala b/src/main/scala/com/codacy/client/bitbucket/client/Authentication.scala
@@ -1,4 +1,4 @@
-package com.codacy.client.client
+package com.codacy.client.bitbucket.client
 
 import play.api.libs.oauth.{ConsumerKey, OAuthCalculator, RequestToken}
 import play.api.libs.ws.{WSAuthScheme, WSRequest}
diff --git a/src/main/scala/com/codacy/client/bitbucket/client/BitbucketClient.scala b/src/main/scala/com/codacy/client/bitbucket/client/BitbucketClient.scala
@@ -1,10 +1,10 @@
-package com.codacy.client.client
+package com.codacy.client.bitbucket.client
 
 import java.net.URI
 
-import com.codacy.client.client.Authentication._
-import com.codacy.client.util.HTTPStatusCodes
-import com.codacy.client.util.Implicits.URIQueryParam
+import com.codacy.client.bitbucket.client.Authentication._
+import com.codacy.client.bitbucket.util.HTTPStatusCodes
+import com.codacy.client.bitbucket.util.Implicits.URIQueryParam
 import com.ning.http.client.AsyncHttpClientConfig
 import play.api.http.Writeable
 import play.api.libs.json._
@@ -102,7 +102,6 @@ class BitbucketClient(credentials: Credentials) {
           FailedResponse(message.detail)
       }
     } else {
-      println(Json.parse(result.body) \ "message")
       FailedResponse(result.statusText)
     }
 
@@ -153,7 +152,6 @@ class BitbucketClient(credentials: Credentials) {
       val body = result.body
       parseJson(body)
     } else {
-      println(Json.parse(result.body) \ "error" \ "message")
       Left(ResponseError(java.util.UUID.randomUUID().toString, result.statusText, result.statusText))
     }
 
diff --git a/src/main/scala/com/codacy/client/bitbucket/client/Request.scala b/src/main/scala/com/codacy/client/bitbucket/client/Request.scala
@@ -1,3 +1,3 @@
-package com.codacy.client.client
+package com.codacy.client.bitbucket.client
 
 case class Request[T](url: String, classType: Class[T])
diff --git a/src/main/scala/com/codacy/client/bitbucket/client/RequestResponse.scala b/src/main/scala/com/codacy/client/bitbucket/client/RequestResponse.scala
@@ -1,4 +1,4 @@
-package com.codacy.client.client
+package com.codacy.client.bitbucket.client
 
 sealed trait RequestResponse[+A] {
 
diff --git a/src/main/scala/com/codacy/client/bitbucket/client/ResponseError.scala b/src/main/scala/com/codacy/client/bitbucket/client/ResponseError.scala
@@ -1,4 +1,4 @@
-package com.codacy.client.client
+package com.codacy.client.bitbucket.client
 
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
diff --git a/src/main/scala/com/codacy/client/bitbucket/util/CommitHelper.scala b/src/main/scala/com/codacy/client/bitbucket/util/CommitHelper.scala
@@ -1,4 +1,4 @@
-package com.codacy.client.util
+package com.codacy.client.bitbucket.util
 
 object CommitHelper {
   def anchor(commitUUID: String): String = {
diff --git a/src/main/scala/com/codacy/client/bitbucket/util/HTTPStatusCodes.scala b/src/main/scala/com/codacy/client/bitbucket/util/HTTPStatusCodes.scala
@@ -1,4 +1,4 @@
-package com.codacy.client.util
+package com.codacy.client.bitbucket.util
 
 object HTTPStatusCodes extends Enumeration {
   type HTTPStatusCodes = Value
diff --git a/src/main/scala/com/codacy/client/bitbucket/util/Implicits.scala b/src/main/scala/com/codacy/client/bitbucket/util/Implicits.scala
@@ -1,4 +1,4 @@
-package com.codacy.client.util
+package com.codacy.client.bitbucket.util
 
 import java.net.URI
 
diff --git a/src/main/scala/com/codacy/client/bitbucket/util/JsonEnumeration.scala b/src/main/scala/com/codacy/client/bitbucket/util/JsonEnumeration.scala
@@ -1,4 +1,4 @@
-package com.codacy.client.util
+package com.codacy.client.bitbucket.util
 
 import play.api.libs.json.Format
 
diff --git a/src/main/scala/com/codacy/client/bitbucket/v1/BuildStatus.scala b/src/main/scala/com/codacy/client/bitbucket/v1/BuildStatus.scala
@@ -1,6 +1,6 @@
 package com.codacy.client.bitbucket.v1
 
-import com.codacy.client.util.JsonEnumeration
+import com.codacy.client.bitbucket.util.JsonEnumeration
 import play.api.libs.json.Json
 
 object CommitStatus extends JsonEnumeration {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v1/service/CommitServices.scala b/src/main/scala/com/codacy/client/bitbucket/v1/service/CommitServices.scala
@@ -1,8 +1,8 @@
 package com.codacy.client.bitbucket.v1.service
 
 import com.codacy.client.bitbucket.v1.CommitComment
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
-import com.codacy.client.util.CommitHelper
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.util.CommitHelper
 import play.api.libs.json.{JsNumber, JsObject, JsString}
 
 class CommitServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v1/service/HookServices.scala b/src/main/scala/com/codacy/client/bitbucket/v1/service/HookServices.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.v1.service
 
 import com.codacy.client.bitbucket.v1.Webhook
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json.Json
 
 class HookServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v1/service/IssueServices.scala b/src/main/scala/com/codacy/client/bitbucket/v1/service/IssueServices.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.v1.service
 
 import com.codacy.client.bitbucket.v1.Issue
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json._
 
 class IssueServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v1/service/PullRequestServices.scala b/src/main/scala/com/codacy/client/bitbucket/v1/service/PullRequestServices.scala
@@ -1,8 +1,8 @@
 package com.codacy.client.bitbucket.v1.service
 
 import com.codacy.client.bitbucket.v1.{PullRequestComment, SimplePullRequestComment}
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
-import com.codacy.client.util.CommitHelper
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.util.CommitHelper
 import play.api.libs.json._
 
 class PullRequestServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v1/service/RepositoryServices.scala b/src/main/scala/com/codacy/client/bitbucket/v1/service/RepositoryServices.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.v1.service
 
 import com.codacy.client.bitbucket.v1.{SimpleRepository, SshKey}
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json.Json
 
 class RepositoryServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v1/service/UrlServices.scala b/src/main/scala/com/codacy/client/bitbucket/v1/service/UrlServices.scala
@@ -1,6 +1,6 @@
 package com.codacy.client.bitbucket.v1.service
 
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json.{JsNull, JsObject}
 
 class UrlServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v1/service/UserServices.scala b/src/main/scala/com/codacy/client/bitbucket/v1/service/UserServices.scala
@@ -1,6 +1,6 @@
 package com.codacy.client.bitbucket.v1.service
 
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import com.codacy.client.bitbucket.v1.{Email, SshKey, User}
 import play.api.libs.json.Json
 
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/BuildStatus.scala b/src/main/scala/com/codacy/client/bitbucket/v2/BuildStatus.scala
@@ -1,6 +1,6 @@
 package com.codacy.client.bitbucket.v2
 
-import com.codacy.client.util.JsonEnumeration
+import com.codacy.client.bitbucket.util.JsonEnumeration
 import play.api.libs.json.Json
 
 object CommitStatus extends JsonEnumeration {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/BuildStatusServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/BuildStatusServices.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.v2.service
 
 import com.codacy.client.bitbucket.v2.BuildStatus
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json._
 
 class BuildStatusServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/CommitServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/CommitServices.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.v2.service
 
 import com.codacy.client.bitbucket.v2.CommitComment
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json.{JsNumber, JsObject, JsString, Json}
 
 class CommitServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/HookServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/HookServices.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.v2.service
 
 import com.codacy.client.bitbucket.v2
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json.Json
 
 class HookServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/IssueServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/IssueServices.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.v2.service
 
 import com.codacy.client.bitbucket.v2.Issue
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json._
 
 class IssueServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/PullRequestServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/PullRequestServices.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.v2.service
 
 import com.codacy.client.bitbucket.v2.{PullRequest, PullRequestComment, SimpleCommit, PullRequestReviewers}
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json._
 
 class PullRequestServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/RepositoryServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/RepositoryServices.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.v2.service
 
 import com.codacy.client.bitbucket.v2.Repository
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 
 class RepositoryServices(client: BitbucketClient) {
 
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/TeamServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/TeamServices.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.v2.service
 
 import com.codacy.client.bitbucket.v2.User
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 
 class TeamServices(client: BitbucketClient) {
 
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/UrlServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/UrlServices.scala
@@ -1,6 +1,6 @@
 package com.codacy.client.bitbucket.v2.service
 
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json.{JsNull, JsObject}
 
 class UrlServices(client: BitbucketClient) {
diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/UserServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/UserServices.scala
@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.v2.service
 
 import com.codacy.client.bitbucket.v2.{Email, SshKey, User}
-import com.codacy.client.client.{BitbucketClient, Request, RequestResponse}
+import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json.Json
 
 class UserServices(client: BitbucketClient) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.codacy.client.client`
	`1`	`+package com.codacy.client.bitbucket.client`
`2`	`2`
`3`	`3`	`import play.api.libs.oauth.{ConsumerKey, OAuthCalculator, RequestToken}`
`4`	`4`	`import play.api.libs.ws.{WSAuthScheme, WSRequest}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-package com.codacy.client.client`
	`1`	`+package com.codacy.client.bitbucket.client`
`2`	`2`
`3`	`3`	`case class Request[T](url: String, classType: Class[T])`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.codacy.client.util`
	`1`	`+package com.codacy.client.bitbucket.util`
`2`	`2`
`3`	`3`	`object CommitHelper {`
`4`	`4`	`def anchor(commitUUID: String): String = {`