bugfix/fixed the java.lang.ExceptionInInitializerError for BerlinGroup Alias

This commit is contained in:
hongwei 2022-09-23 11:32:13 +02:00
parent b5666c8611
commit b3e927ddb8
11 changed files with 26 additions and 14 deletions

View File

@ -11,7 +11,7 @@ import code.views.Views
import com.github.dwickern.macros.NameOf.nameOf
import com.openbankproject.commons.ExecutionContext.Implicits.global
import com.openbankproject.commons.model._
import com.openbankproject.commons.util.ScannedApiVersion
import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion}
import dispatch.Future
import net.liftweb.common.{Box, Empty, Full}
import net.liftweb.http.Req
@ -39,7 +39,7 @@ object APIMethods_AtmsApi extends RestHelper {
lazy val JsonHead = new TestHead with JsonTest
val apiVersion = ScannedApiVersion("CNBV9", "CNBV9", "v1.0.0")
val apiVersion = ApiVersion.cnbv9
val resourceDocs = ArrayBuffer[ResourceDoc]()
val apiRelations = ArrayBuffer[ApiRelation]()
protected implicit def JvalueToSuper(what: JValue): JvalueCaseClass = JvalueCaseClass(what)

View File

@ -4,7 +4,7 @@ import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, ResourceDoc, getAllowedEndpoints}
import code.api.util.ScannedApis
import code.util.Helper.MdcLoggable
import com.openbankproject.commons.util.ScannedApiVersion
import com.openbankproject.commons.util.ApiVersion
import scala.collection.mutable.ArrayBuffer
@ -13,7 +13,7 @@ This file defines which endpoints from all the versions are available in v1
*/
object CNBV9_1_0_0 extends OBPRestHelper with MdcLoggable with ScannedApis {
// CNBV9
override val apiVersion = ScannedApiVersion("CNBV9", "CNBV9", "v1.0.0")
override val apiVersion = ApiVersion.cnbv9
val versionStatus = "DRAFT"
private[this] val endpoints = APIMethods_AtmsApi.endpoints

View File

@ -35,7 +35,7 @@ import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, ResourceDoc, getAllowedEndpoints}
import code.api.util.ScannedApis
import code.util.Helper.MdcLoggable
import com.openbankproject.commons.util.ScannedApiVersion
import com.openbankproject.commons.util.ApiVersion
import scala.collection.mutable.ArrayBuffer
@ -45,7 +45,7 @@ This file defines which endpoints from all the versions are available in v1
*/
object OBP_MXOF_1_0_0 extends OBPRestHelper with MdcLoggable with ScannedApis {
// mx-open-finance
override val apiVersion = ScannedApiVersion("mxof", "MXOF", "v1.0.0")
override val apiVersion = ApiVersion.mxofV100
val versionStatus = "DRAFT"
private[this] val endpoints = APIMethods_AtmsApi.endpoints

View File

@ -22,6 +22,7 @@ import com.github.dwickern.macros.NameOf.nameOf
import com.openbankproject.commons.ExecutionContext.Implicits.global
import com.openbankproject.commons.model._
import com.openbankproject.commons.model.enums.{ChallengeType, StrongCustomerAuthentication, StrongCustomerAuthenticationStatus}
import com.openbankproject.commons.util.ApiVersion
import net.liftweb.common.{Empty, Full}
import net.liftweb.http.js.JE.JsRaw
import net.liftweb.http.rest.RestHelper
@ -33,7 +34,7 @@ import scala.collection.mutable.ArrayBuffer
import scala.concurrent.Future
object APIMethods_AccountInformationServiceAISApi extends RestHelper {
val apiVersion = OBP_BERLIN_GROUP_1_3.apiVersion
val apiVersion = ApiVersion.berlinGroupV13
val resourceDocs = ArrayBuffer[ResourceDoc]()
val apiRelations = ArrayBuffer[ApiRelation]()
protected implicit def JvalueToSuper(what: JValue): JvalueCaseClass = JvalueCaseClass(what)

View File

@ -5,6 +5,7 @@ import code.api.builder.AccountInformationServiceAISApi.APIMethods_AccountInform
import code.api.builder.PaymentInitiationServicePISApi.APIMethods_PaymentInitiationServicePISApi
import code.api.builder.SigningBasketsApi.APIMethods_SigningBasketsApi
import code.api.util.APIUtil._
import com.openbankproject.commons.util.ApiVersion
import net.liftweb.http.rest.RestHelper
import net.liftweb.json._
@ -13,7 +14,7 @@ import scala.collection.mutable.ArrayBuffer
//TODO maybe we can remove this common services, it just show other apis in this tag. no new ones.
object APIMethods_CommonServicesApi extends RestHelper {
val apiVersion = OBP_BERLIN_GROUP_1_3.apiVersion
val apiVersion = ApiVersion.berlinGroupV13
val resourceDocs = ArrayBuffer[ResourceDoc]()
val apiRelations = ArrayBuffer[ApiRelation]()
val codeContext = CodeContext(resourceDocs, apiRelations)

View File

@ -10,6 +10,7 @@ import code.fx.fx
import code.util.Helper
import com.github.dwickern.macros.NameOf.nameOf
import com.openbankproject.commons.ExecutionContext.Implicits.global
import com.openbankproject.commons.util.ApiVersion
import net.liftweb.common.Full
import net.liftweb.http.rest.RestHelper
import net.liftweb.json
@ -19,7 +20,7 @@ import scala.collection.immutable.Nil
import scala.collection.mutable.ArrayBuffer
object APIMethods_ConfirmationOfFundsServicePIISApi extends RestHelper {
val apiVersion = OBP_BERLIN_GROUP_1_3.apiVersion
val apiVersion = ApiVersion.berlinGroupV13
val resourceDocs = ArrayBuffer[ResourceDoc]()
val apiRelations = ArrayBuffer[ApiRelation]()
protected implicit def JvalueToSuper(what: JValue): JvalueCaseClass = JvalueCaseClass(what)

View File

@ -40,7 +40,7 @@ import code.api.builder.SigningBasketsApi.APIMethods_SigningBasketsApi
import code.api.util.APIUtil.{OBPEndpoint, ResourceDoc, getAllowedEndpoints}
import code.api.util.ScannedApis
import code.util.Helper.MdcLoggable
import com.openbankproject.commons.util.ScannedApiVersion
import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion}
import scala.collection.mutable.ArrayBuffer
@ -52,7 +52,7 @@ This file defines which endpoints from all the versions are available in v1
*/
object OBP_BERLIN_GROUP_1_3 extends OBPRestHelper with MdcLoggable with ScannedApis {
override val apiVersion = ScannedApiVersion("berlin-group", "BG", "v1.3")
override val apiVersion = ApiVersion.berlinGroupV13
val versionStatus = "DRAFT"
val endpoints =

View File

@ -43,7 +43,7 @@ This file defines which endpoints from all the versions are available in v1
*/
object OBP_BERLIN_GROUP_1_3_Alias extends OBPRestHelper with MdcLoggable with ScannedApis {
override val apiVersion = ScannedApiVersion(berlinGroupV13AliasPath.head, berlinGroupV13AliasPath.head, berlinGroupV13AliasPath.last)
val versionStatus = OBP_BERLIN_GROUP_1_3.versionStatus
val versionStatus = "DRAFT"
override val allResourceDocs: ArrayBuffer[ResourceDoc] = if(berlinGroupV13AliasPath.nonEmpty){
OBP_BERLIN_GROUP_1_3.allResourceDocs.map(resourceDoc => resourceDoc.copy(

View File

@ -20,6 +20,7 @@ import com.openbankproject.commons.model._
import com.openbankproject.commons.model.enums.ChallengeType.BERLINGROUP_PAYMENT_CHALLENGE
import com.openbankproject.commons.model.enums.TransactionRequestStatus._
import com.openbankproject.commons.model.enums.{ChallengeType, StrongCustomerAuthenticationStatus, TransactionRequestStatus}
import com.openbankproject.commons.util.ApiVersion
import net.liftweb.common.Full
import net.liftweb.http.js.JE.JsRaw
import net.liftweb.http.rest.RestHelper
@ -32,7 +33,7 @@ import scala.collection.mutable.ArrayBuffer
import scala.concurrent.Future
object APIMethods_PaymentInitiationServicePISApi extends RestHelper {
val apiVersion = OBP_BERLIN_GROUP_1_3.apiVersion
val apiVersion = ApiVersion.berlinGroupV13
val resourceDocs = ArrayBuffer[ResourceDoc]()
val apiRelations = ArrayBuffer[ApiRelation]()
protected implicit def JvalueToSuper(what: JValue): JvalueCaseClass = JvalueCaseClass(what)

View File

@ -20,10 +20,12 @@ import com.github.dwickern.macros.NameOf.nameOf
import scala.collection.immutable.Nil
import scala.collection.mutable.ArrayBuffer
import com.openbankproject.commons.ExecutionContext.Implicits.global
import com.openbankproject.commons.util.ApiVersion
import scala.concurrent.Future
object APIMethods_SigningBasketsApi extends RestHelper {
val apiVersion = OBP_BERLIN_GROUP_1_3.apiVersion
val apiVersion = ApiVersion.berlinGroupV13
val resourceDocs = ArrayBuffer[ResourceDoc]()
val apiRelations = ArrayBuffer[ApiRelation]()
protected implicit def JvalueToSuper(what: JValue): JvalueCaseClass = JvalueCaseClass(what)

View File

@ -130,6 +130,12 @@ object ApiVersion {
`dynamic-endpoint` ::
`dynamic-entity`::
Nil
//This is other standard versions
val berlinGroupV13 = ScannedApiVersion("berlin-group", "BG", "v1.3")
val mxofV100 = ScannedApiVersion("mxof", "MXOF", "v1.0.0")
val cnbv9 = ScannedApiVersion("CNBV9", "CNBV9", "v1.0.0")
/**
* the ApiPathZero value must be got by obp-api project, so here is a workaround, let obp-api project modify this value