diff --git a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala index d0031dd83..02656f71f 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala @@ -2,6 +2,7 @@ package code.api.v4_0_0 import java.net.URLEncoder import java.text.SimpleDateFormat +import java.util import java.util.{Calendar, Date} import code.DynamicData.{DynamicData, DynamicDataProvider} @@ -71,6 +72,7 @@ import code.views.Views import code.webhook.{AccountWebhook, BankAccountNotificationWebhookTrait, SystemAccountNotificationWebhookTrait} import code.webuiprops.MappedWebUiPropsProvider.getWebUiPropsValue import com.github.dwickern.macros.NameOf.nameOf +import com.networknt.schema.ValidationMessage import com.openbankproject.commons.ExecutionContext.Implicits.global import com.openbankproject.commons.dto.GetProductsParam import com.openbankproject.commons.model.enums.ChallengeType.OBP_TRANSACTION_REQUEST_CHALLENGE @@ -90,7 +92,6 @@ import net.liftweb.mapper.By import net.liftweb.util.Helpers.{now, tryo} import net.liftweb.util.Mailer.{From, PlainMailBodyType, Subject, To, XHTMLMailBodyType} import net.liftweb.util.{Helpers, Mailer, StringHelpers} -import org.apache.commons.collections4.CollectionUtils import org.apache.commons.lang3.StringUtils import scala.collection.immutable.{List, Nil} @@ -9417,9 +9418,9 @@ trait APIMethods400 { for { (Full(u), callContext) <- SS.user - schemaErrors = JsonSchemaUtil.validateSchema(httpBody) + schemaErrors: util.Set[ValidationMessage] = JsonSchemaUtil.validateSchema(httpBody) _ <- Helper.booleanToFuture(failMsg = s"$JsonSchemaIllegal${StringUtils.join(schemaErrors, "; ")}", cc=callContext) { - CollectionUtils.isEmpty(schemaErrors) + CommonUtil.Collections.isEmpty(schemaErrors) } (isExists, callContext) <- NewStyle.function.isJsonSchemaValidationExists(operationId, callContext) @@ -9465,7 +9466,7 @@ trait APIMethods400 { schemaErrors = JsonSchemaUtil.validateSchema(httpBody) _ <- Helper.booleanToFuture(failMsg = s"$JsonSchemaIllegal${StringUtils.join(schemaErrors, "; ")}", cc=callContext) { - CollectionUtils.isEmpty(schemaErrors) + CommonUtil.Collections.isEmpty(schemaErrors) } (isExists, callContext) <- NewStyle.function.isJsonSchemaValidationExists(operationId, callContext) diff --git a/obp-api/src/main/scala/code/util/JsonSchemaUtil.scala b/obp-api/src/main/scala/code/util/JsonSchemaUtil.scala index db77603dd..ae1b9cef8 100644 --- a/obp-api/src/main/scala/code/util/JsonSchemaUtil.scala +++ b/obp-api/src/main/scala/code/util/JsonSchemaUtil.scala @@ -3,12 +3,11 @@ package code.util import java.nio.charset.Charset import java.util.{Set => JSet} -import code.api.util.CallContext -import code.validation.{JsonValidation, JsonSchemaValidationProvider} +import code.api.util.{CallContext, CommonUtil} +import code.validation.{JsonSchemaValidationProvider, JsonValidation} import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper} import com.google.common.hash.Hashing import com.networknt.schema.{JsonSchema, JsonSchemaFactory, SpecVersionDetector, ValidationMessage} -import org.apache.commons.collections4.CollectionUtils import org.apache.commons.lang3.StringUtils object JsonSchemaUtil { @@ -47,7 +46,7 @@ object JsonSchemaUtil { requestBody <- callContext.flatMap(_.httpBody) JsonValidation(_, jsonSchema) <- JsonSchemaValidationProvider.validationProvider.vend.getByOperationId(operationIdBuilder) errorSet = JsonSchemaUtil.validateJson(jsonSchema, requestBody) - if CollectionUtils.isNotEmpty(errorSet) + if CommonUtil.Collections.isNotEmpty(errorSet) errorInfo = StringUtils.join(errorSet, "; ") } yield errorInfo } diff --git a/obp-commons/pom.xml b/obp-commons/pom.xml index 8c49e1d61..ab0ec3e02 100644 --- a/obp-commons/pom.xml +++ b/obp-commons/pom.xml @@ -72,6 +72,30 @@ + + org.owasp + dependency-check-maven + 7.1.1 + + notifier-dependency-check + HTML + 10 + false + true + + true + true + false + pom + + + + + aggregate + + + + org.apache.maven.plugins maven-surefire-plugin diff --git a/pom.xml b/pom.xml index 71302b8ca..3437f7d35 100644 --- a/pom.xml +++ b/pom.xml @@ -96,11 +96,6 @@ lift-mapper_${scala.version} ${lift.version} - - org.apache.commons - commons-collections4 - 4.4 - org.apache.commons commons-lang3