Skip to content

Commit c9d39a7

Browse files
committed
to get rid of StrictLogging
1 parent e5a0327 commit c9d39a7

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ThisBuild / organization := "app.softnetwork"
22

33
name := "account"
44

5-
ThisBuild / version := "0.6.3.2"
5+
ThisBuild / version := "0.6.3.3"
66

77
ThisBuild / scalaVersion := "2.12.18"
88

common/src/main/scala/app/softnetwork/account/spi/OAuth2Service.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ import com.github.scribejava.core.builder.ServiceBuilder
99
import com.github.scribejava.core.builder.api.DefaultApi20
1010
import com.github.scribejava.core.model.{OAuth2AccessToken, OAuthRequest, Response}
1111
import com.github.scribejava.core.oauth.{AccessTokenRequestParams, OAuth20Service}
12-
import com.typesafe.scalalogging.StrictLogging
1312

1413
import scala.util.Try
1514

16-
trait OAuth2Service extends StrictLogging {
15+
trait OAuth2Service {
1716
def networkName: String
1817

1918
protected def provider: OAuthProvider = AccountSettings.OAuthSettings

core/src/main/scala/app/softnetwork/account/persistence/typed/AccountBehavior.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,9 @@ trait AccountBehavior[T <: Account with AccountDecorator, P <: Profile]
479479
case Some(account) if account.status.isActive =>
480480
import cmd._
481481
account.applications.find(
482-
_.accessToken.exists(at => at.refreshToken == sha256(refreshToken) && !at.refreshExpired)
482+
_.accessToken.exists(at =>
483+
at.refreshToken == sha256(refreshToken) && !at.refreshExpired
484+
)
483485
) match {
484486
case Some(application) =>
485487
val accessToken =

core/src/main/scala/app/softnetwork/account/service/AccountService.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import akka.http.scaladsl.server.{AuthenticationFailedRejection, RejectionHandle
55
import akka.http.scaladsl.unmarshalling.Unmarshaller
66
import com.softwaremill.session.CsrfDirectives._
77
import com.softwaremill.session.CsrfOptions._
8-
import com.typesafe.scalalogging.StrictLogging
98
import de.heikoseeberger.akkahttpjson4s.Json4sSupport
109
import app.softnetwork.api.server._
1110
import app.softnetwork.persistence.typed.CommandTypeKey
@@ -32,7 +31,6 @@ trait AccountService[PV <: ProfileView, DV <: AccountDetailsView, AV <: AccountV
3231
extends AccountServiceDirectives[SD]
3332
with DefaultComplete
3433
with Json4sSupport
35-
with StrictLogging
3634
with ApiRoute {
3735
_: CommandTypeKey[AccountCommand] with ManifestWrapper[AV] with SessionMaterials[SD] =>
3836

core/src/main/scala/app/softnetwork/account/service/OAuthService.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import app.softnetwork.persistence.typed.CommandTypeKey
1010
import app.softnetwork.session.service.SessionMaterials
1111
import com.softwaremill.session.CsrfDirectives._
1212
import com.softwaremill.session.CsrfOptions._
13-
import com.typesafe.scalalogging.StrictLogging
1413
import de.heikoseeberger.akkahttpjson4s.Json4sSupport
1514
import org.json4s.{jackson, Formats}
1615
import org.json4s.jackson.Serialization
@@ -27,7 +26,6 @@ trait OAuthService[SD <: SessionData with SessionDataDecorator[SD]]
2726
extends AccountServiceDirectives[SD]
2827
with DefaultComplete
2928
with Json4sSupport
30-
with StrictLogging
3129
with ApiRoute { _: CommandTypeKey[AccountCommand] with SessionMaterials[SD] =>
3230

3331
implicit def sessionConfig: SessionConfig
@@ -253,7 +251,7 @@ trait OAuthService[SD <: SessionData with SessionDataDecorator[SD]]
253251
complete(HttpResponse(StatusCodes.InternalServerError))
254252
}
255253
case Failure(f) =>
256-
logger.error(f.getMessage, f)
254+
log.error(f.getMessage, f)
257255
complete(HttpResponse(StatusCodes.InternalServerError))
258256
}
259257
case _ =>

0 commit comments

Comments
 (0)