Skip to content

fix all compile warnings #1318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 16, 2019
Merged

fix all compile warnings #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd31050
add jitpack.yml, make the jitpack can build this project correctly, s…
oldbig Jun 14, 2019
4180a8a
fix build warnings: imported `XXXX' is permanently hidden by definiti…
oldbig Jun 15, 2019
9113c3d
fix build warnings: a pure expression does nothing in statement position
oldbig Jun 15, 2019
89b24cc
fix build warnings: abstract type pattern T is unchecked since it is …
oldbig Jun 15, 2019
fec2e2a
fix build warnings: match may not be exhaustive
oldbig Jun 15, 2019
c1396db
fix build warnings: unreachable code due to variable pattern， pattern…
oldbig Jun 15, 2019
50a418e
fix build warnings: rename object Yyyys to YyyyX, fix imported `Xxxx'…
oldbig Jun 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions jitpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
install:
- echo "Running a custom install command"
- ./mvn.sh clean install -pl .,obp-commons && ./mvn.sh install -DskipTests -pl obp-api
2 changes: 0 additions & 2 deletions obp-api/src/main/scala/bootstrap/liftweb/Boot.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,6 @@ class Boot extends MdcLoggable {

Migration.database.executeScripts()

Glossary.glossaryItems
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line do nothing, will cause a warning.


// whether export LocalMappedConnector methods as endpoints, it is just for develop
if (APIUtil.getPropsAsBoolValue("connector.export.LocalMappedConnector", false)){
ConnectorEndpoints.registerConnectorEndpoints
Expand Down
2 changes: 1 addition & 1 deletion obp-api/src/main/scala/code/accountapplication/AccountApplication.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import net.liftweb.util.SimpleInjector

import scala.concurrent.Future

object AccountApplication extends SimpleInjector {
object AccountApplicationX extends SimpleInjector {

val accountApplication = new Inject(buildOne _) {}

Expand Down
2 changes: 1 addition & 1 deletion obp-api/src/main/scala/code/accountattribute/AccountAttribute.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import net.liftweb.util.SimpleInjector

import scala.concurrent.Future

object AccountAttribute extends SimpleInjector {
object AccountAttributeX extends SimpleInjector {

val accountAttributeProvider = new Inject(buildOne _) {}

Expand Down
23 changes: 6 additions & 17 deletions obp-api/src/main/scala/code/actorsystem/ObpActorHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,15 @@ package code.actorsystem

import code.api.APIFailure
import net.liftweb.common._
import net.liftweb.json.JsonAST.JValue

trait ObpActorHelper {

def extractResult[T](in: T) = {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

totally wrong use of generic and match case, cause warnings.

def extractResult(in: Any) = {
in match {
case pf: ParamFailure[_] =>
pf.param match {
case af: APIFailure => af
case f: Failure => f
case _ => pf
}
case af: APIFailure => af
case f: Failure => f
case l: List[_] => l.asInstanceOf[List[T]]
case s: Set[_] => s.asInstanceOf[Set[T]]
case Full(r) => r
case j: JValue => j
case t: T => t
case _ => APIFailure(s"result extraction failed", 501)
}
case ParamFailure(_, _, _, param@ (_:APIFailure | _: Failure)) => param
case pf: ParamFailure[_] => pf
case Full(r) => r
case _ => in
}
}
}
27 changes: 5 additions & 22 deletions obp-api/src/main/scala/code/actorsystem/ObpActorInit.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import net.liftweb.common._
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration._
import scala.concurrent.{Await, Future}
import scala.reflect.ClassTag

trait ObpActorInit extends MdcLoggable{
// Default is 3 seconds, which should be more than enough for slower systems
Expand All @@ -20,38 +21,20 @@ trait ObpActorInit extends MdcLoggable{
val TIMEOUT = (ACTOR_TIMEOUT seconds)
implicit val timeout = Timeout(ACTOR_TIMEOUT * (1000 milliseconds))

/**
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

totally wrong use of generic and match case, and asInstanceOf.
so just remove it, and original caller switch to call extractFutureToBox method

* This function extracts the payload from Future.
* It is used for Old Style Endpoints at Kafka connector.
* @param f The payload wrapped into Future
* @tparam T The type of the payload
* @return The payload
*/
def extractFuture[T](f: Future[Any]): T = {
val r = f.map {
case s: Set[_] => s.asInstanceOf[Set[T]]
case l: List[_] => l.asInstanceOf[List[T]]
case t: T => t
case _ => Empty ~> APIFailure(s"future extraction failed", 501)
}
Await.result(r, TIMEOUT).asInstanceOf[T]
}

/**
* This function extracts the payload from Future and wraps it to Box.
* It is used for Old Style Endpoints at Kafka connector.
* @param f The payload wrapped into Future
* @tparam T The type of the payload
* @return The payload wrapped into Box
*/
def extractFutureToBox[T](f: Future[Any]): Box[T] = {
val r = f.map {
case pf: ParamFailure[_] => Empty ~> pf
case af: APIFailure => Empty ~> af
def extractFutureToBox[T: ClassTag](f: Future[Any]): Box[T] = {
val r: Future[Box[T]] = f.map {
case f@ (_: ParamFailure[_] | _: APIFailure) => Empty ~> f
case f: Failure => f
case Empty => Empty
case t: T => Full(t)
case _ => Empty ~> APIFailure(s"future extraction to box failed", 501)
case _ => Empty ~> APIFailure("future extraction to box failed", 501)
}

Await.result(r, TIMEOUT)
Expand Down
2 changes: 1 addition & 1 deletion obp-api/src/main/scala/code/api/GatewayLogin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import code.api.util._
import code.bankconnectors.Connector
import code.consumer.Consumers
import code.model.dataAccess.AuthUser
import code.model.{Consumer, User}
import code.model.{Consumer, UserX}
import code.users.Users
import code.util.Helper.MdcLoggable
import com.nimbusds.jwt.JWTClaimsSet
Expand Down
22 changes: 7 additions & 15 deletions obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
package code.api.Polish.v2_1_1_1

import code.api.APIFailureNewStyle
import code.api.berlin.group.v1_3.JvalueCaseClass
import net.liftweb.json
import net.liftweb.json._
import code.api.util.APIUtil.{defaultBankId, _}
import code.api.util.{ApiVersion, NewStyle}
import code.api.util.ErrorMessages._
import code.api.util.APIUtil._
import code.api.util.ApiTag
import code.api.util.ApiTag._
import code.api.util.NewStyle.HttpCode
import code.bankconnectors.Connector
import code.model._
import code.util.Helper
import code.views.Views
import code.api.util.ErrorMessages._
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.common.Full
import net.liftweb.http.rest.RestHelper
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.json
import net.liftweb.json._

import scala.collection.immutable.Nil
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import code.api.Polish.v2_1_1_1.OBP_PAPI_2_1_1_1
import code.api.util.ApiTag

object APIMethods_AISApi extends RestHelper {
val apiVersion = OBP_PAPI_2_1_1_1.apiVersion
Expand Down
22 changes: 7 additions & 15 deletions obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
package code.api.Polish.v2_1_1_1

import code.api.APIFailureNewStyle
import code.api.berlin.group.v1_3.JvalueCaseClass
import net.liftweb.json
import net.liftweb.json._
import code.api.util.APIUtil.{defaultBankId, _}
import code.api.util.{ApiVersion, NewStyle}
import code.api.util.ErrorMessages._
import code.api.util.APIUtil._
import code.api.util.ApiTag
import code.api.util.ApiTag._
import code.api.util.NewStyle.HttpCode
import code.bankconnectors.Connector
import code.model._
import code.util.Helper
import code.views.Views
import code.api.util.ErrorMessages._
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.common.Full
import net.liftweb.http.rest.RestHelper
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.json
import net.liftweb.json._

import scala.collection.immutable.Nil
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import code.api.Polish.v2_1_1_1.OBP_PAPI_2_1_1_1
import code.api.util.ApiTag

object APIMethods_ASApi extends RestHelper {
val apiVersion = OBP_PAPI_2_1_1_1.apiVersion
Expand Down
22 changes: 7 additions & 15 deletions obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
package code.api.Polish.v2_1_1_1

import code.api.APIFailureNewStyle
import code.api.berlin.group.v1_3.JvalueCaseClass
import net.liftweb.json
import net.liftweb.json._
import code.api.util.APIUtil.{defaultBankId, _}
import code.api.util.{ApiVersion, NewStyle}
import code.api.util.ErrorMessages._
import code.api.util.APIUtil._
import code.api.util.ApiTag
import code.api.util.ApiTag._
import code.api.util.NewStyle.HttpCode
import code.bankconnectors.Connector
import code.model._
import code.util.Helper
import code.views.Views
import code.api.util.ErrorMessages._
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.common.Full
import net.liftweb.http.rest.RestHelper
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.json
import net.liftweb.json._

import scala.collection.immutable.Nil
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import code.api.Polish.v2_1_1_1.OBP_PAPI_2_1_1_1
import code.api.util.ApiTag

object APIMethods_CAFApi extends RestHelper {
val apiVersion = OBP_PAPI_2_1_1_1.apiVersion
Expand Down
5 changes: 0 additions & 5 deletions obp-api/src/main/scala/code/api/Polish/v2_1_1_1/OBP_PAPI_2_1_1_1.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ import code.api.util.APIUtil.{OBPEndpoint, ResourceDoc, getAllowedEndpoints}
import code.api.util.{ScannedApiVersion, ScannedApis}
import code.util.Helper.MdcLoggable

import code.api.Polish.v2_1_1_1.APIMethods_AISApi
import code.api.Polish.v2_1_1_1.APIMethods_ASApi
import code.api.Polish.v2_1_1_1.APIMethods_CAFApi
import code.api.Polish.v2_1_1_1.APIMethods_PISApi

import scala.collection.mutable.ArrayBuffer


Expand Down
22 changes: 7 additions & 15 deletions obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
package code.api.Polish.v2_1_1_1

import code.api.APIFailureNewStyle
import code.api.berlin.group.v1_3.JvalueCaseClass
import net.liftweb.json
import net.liftweb.json._
import code.api.util.APIUtil.{defaultBankId, _}
import code.api.util.{ApiVersion, NewStyle}
import code.api.util.ErrorMessages._
import code.api.util.APIUtil._
import code.api.util.ApiTag
import code.api.util.ApiTag._
import code.api.util.NewStyle.HttpCode
import code.bankconnectors.Connector
import code.model._
import code.util.Helper
import code.views.Views
import code.api.util.ErrorMessages._
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.common.Full
import net.liftweb.http.rest.RestHelper
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.json
import net.liftweb.json._

import scala.collection.immutable.Nil
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import code.api.Polish.v2_1_1_1.OBP_PAPI_2_1_1_1
import code.api.util.ApiTag

object APIMethods_PISApi extends RestHelper {
val apiVersion = OBP_PAPI_2_1_1_1.apiVersion
Expand Down
16 changes: 7 additions & 9 deletions obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
package code.api.STET.v1_4

import code.api.APIFailureNewStyle
import code.api.STET.v1_4.JSONFactory_STET_1_4._
import code.api.berlin.group.v1_3.JvalueCaseClass
import net.liftweb.json
import net.liftweb.json._
import code.api.util.APIUtil.{defaultBankId, _}
import code.api.util.{ApiVersion, NewStyle}
import code.api.util.ErrorMessages._
import code.api.util.ApiTag._
import code.api.util.ErrorMessages._
import code.api.util.{ApiTag, NewStyle}
import code.api.util.NewStyle.HttpCode
import code.bankconnectors.Connector
import code.model._
import code.util.Helper
import code.views.Views
import com.github.dwickern.macros.NameOf.nameOf
import com.openbankproject.commons.model.{AccountId, BankId, BankIdAccountId, ViewId}
import net.liftweb.common.Full
import net.liftweb.http.rest.RestHelper
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.json
import net.liftweb.json._

import scala.collection.immutable.Nil
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import code.api.STET.v1_4.OBP_STET_1_4
import code.api.util.ApiTag
import code.api.STET.v1_4.JSONFactory_STET_1_4._
import com.openbankproject.commons.model.{AccountId, BankId, BankIdAccountId, ViewId}

object APIMethods_AISPApi extends RestHelper {
val apiVersion = OBP_STET_1_4.apiVersion
Expand Down
22 changes: 7 additions & 15 deletions obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
package code.api.STET.v1_4

import code.api.APIFailureNewStyle
import code.api.berlin.group.v1_3.JvalueCaseClass
import net.liftweb.json
import net.liftweb.json._
import code.api.util.APIUtil.{defaultBankId, _}
import code.api.util.{ApiVersion, NewStyle}
import code.api.util.ErrorMessages._
import code.api.util.APIUtil._
import code.api.util.ApiTag
import code.api.util.ApiTag._
import code.api.util.NewStyle.HttpCode
import code.bankconnectors.Connector
import code.model._
import code.util.Helper
import code.views.Views
import code.api.util.ErrorMessages._
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.common.Full
import net.liftweb.http.rest.RestHelper
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.json
import net.liftweb.json._

import scala.collection.immutable.Nil
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import code.api.STET.v1_4.OBP_STET_1_4
import code.api.util.ApiTag

object APIMethods_CBPIIApi extends RestHelper {
val apiVersion = OBP_STET_1_4.apiVersion
Expand Down
4 changes: 0 additions & 4 deletions obp-api/src/main/scala/code/api/STET/v1_4/OBP_STET_1_4.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ import code.api.util.APIUtil.{OBPEndpoint, ResourceDoc, getAllowedEndpoints}
import code.api.util.{ScannedApiVersion, ScannedApis}
import code.util.Helper.MdcLoggable

import code.api.STET.v1_4.APIMethods_AISPApi
import code.api.STET.v1_4.APIMethods_CBPIIApi
import code.api.STET.v1_4.APIMethods_PISPApi

import scala.collection.mutable.ArrayBuffer


Expand Down
22 changes: 7 additions & 15 deletions obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
package code.api.STET.v1_4

import code.api.APIFailureNewStyle
import code.api.berlin.group.v1_3.JvalueCaseClass
import net.liftweb.json
import net.liftweb.json._
import code.api.util.APIUtil.{defaultBankId, _}
import code.api.util.{ApiVersion, NewStyle}
import code.api.util.ErrorMessages._
import code.api.util.APIUtil._
import code.api.util.ApiTag
import code.api.util.ApiTag._
import code.api.util.NewStyle.HttpCode
import code.bankconnectors.Connector
import code.model._
import code.util.Helper
import code.views.Views
import code.api.util.ErrorMessages._
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.common.Full
import net.liftweb.http.rest.RestHelper
import com.github.dwickern.macros.NameOf.nameOf
import net.liftweb.json
import net.liftweb.json._

import scala.collection.immutable.Nil
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import code.api.STET.v1_4.OBP_STET_1_4
import code.api.util.ApiTag

object APIMethods_PISPApi extends RestHelper {
val apiVersion = OBP_STET_1_4.apiVersion
Expand Down
Loading