diff --git a/fizz-bootstrap/js/common.js b/fizz-bootstrap/js/common.js deleted file mode 100644 index c8eb437..0000000 --- a/fizz-bootstrap/js/common.js +++ /dev/null @@ -1,273 +0,0 @@ -/** - * context 上下文便捷操作函数 - * - */ -var common = { - /* *********** private function begin *********** */ - - /** - * 获取上下文中客户端请求对象 - * @param {*} ctx 上下文 【必填】 - */ - getInputReq: function (ctx){ - if(!ctx || !ctx['input'] || !ctx['input']['request']){ - return {}; - } - return ctx['input']['request'] - }, - - /** - * 获取上下文步骤中请求接口的请求对象 - * @param {*} ctx 上下文 【必填】 - * @param {*} stepName 步骤名称 【必填】 - * @param {*} requestName 请求名称 【必填】 - */ - getStepReq: function (ctx, stepName, requestName){ - if(!ctx || !stepName || !requestName){ - return {}; - } - if(!ctx[stepName] || !ctx[stepName]['requests'] || !ctx[stepName]['requests'][requestName] || - !ctx[stepName]['requests'][requestName]['request']){ - return {}; - } - return ctx[stepName]['requests'][requestName]['request']; - }, - - /** - * 获取上下文步骤中请求接口的响应对象 - * @param {*} ctx 上下文 【必填】 - * @param {*} stepName 步骤名称 【必填】 - * @param {*} requestName 请求名称 【必填】 - */ - getStepResp: function (ctx, stepName, requestName){ - if(!ctx || !stepName || !requestName){ - return {}; - } - if(!ctx[stepName] || !ctx[stepName]['requests'] || !ctx[stepName]['requests'][requestName] || - !ctx[stepName]['requests'][requestName]['response']){ - return {}; - } - return ctx[stepName]['requests'][requestName]['response']; - }, - - /* *********** private function end *********** */ - - /* *********** input begin ************ */ - - /** - * 获取客户端请求头 - * @param {*} ctx 上下文 【必填】 - * @param {*} headerName 请求头字段名 【选填】，不传时返回所有请求头 - */ - getInputReqHeader: function (ctx, headerName){ - var req = this.getInputReq(ctx); - var headers = req['headers'] || {}; - return headerName ? headers[headerName.toUpperCase()] : headers; - }, - - /** - * 获取客户端URL请求参数（query string） - * @param {*} ctx 上下文 【必填】 - * @param {*} paramName URL参数名 【选填】，不传时返回所有请求参数 - */ - getInputReqParam: function (ctx, paramName){ - var req = this.getInputReq(ctx); - var params = req['params'] || {}; - return paramName ? params[paramName] : params; - }, - - /** - * 获取客户端请求体 - * @param {*} ctx 上下文 【必填】 - * @param {*} field 字段名 【选填】，不传时返回整个请求体 - */ - getInputReqBody: function (ctx, field){ - var req = this.getInputReq(ctx); - var body = req['body'] || {}; - return field ? body[field] : body; - }, - - /** - * 获取返回给客户端的响应头 - * @param {*} ctx 上下文 【必填】 - * @param {*} headerName 响应头字段名 【选填】，不传时返回所有响应头 - */ - getInputRespHeader: function (ctx, headerName){ - var req = this.getInputReq(ctx); - var headers = req['headers'] || {}; - return headerName ? headers[headerName.toUpperCase()] : headers; - }, - - /** - * 获取返回给客户端的响应体 - * @param {*} ctx 上下文 【必填】 - * @param {*} field 字段名 【选填】，不传时返回整个响应体 - */ - getInputRespBody: function (ctx, field){ - var req = this.getInputReq(ctx); - var body = req['body'] || {}; - return field ? body[field] : body; - }, - - /* *********** input begin ************ */ - - /* *********** step request begin ************ */ - - /** - * 获取步骤中调用的接口的请求头 - * @param {*} ctx 上下文 【必填】 - * @param {*} stepName 步骤名【必填】 - * @param {*} requestName 请求的接口名 【必填】 - * @param {*} headerName 请求头字段名 【选填】，不传时返回所有请求头 - */ - getStepReqHeader: function (ctx, stepName, requestName, headerName){ - var req = this.getStepReq(ctx, stepName, requestName); - var headers = req['headers'] || {}; - return headerName ? headers[headerName.toUpperCase()] : headers; - }, - - /** - * 获取步骤中调用的接口的URL参数 - * @param {*} ctx 上下文 【必填】 - * @param {*} stepName 步骤名【必填】 - * @param {*} requestName 请求的接口名 【必填】 - * @param {*} paramName URL参数名 【选填】，不传时返回所有URL参数 - */ - getStepReqParam: function (ctx, stepName, requestName, paramName){ - var req = this.getStepReq(ctx, stepName, requestName); - var params = req['params'] || {}; - return paramName ? params[paramName] : params; - }, - - /** - * 获取步骤中调用的接口的请求体 - * @param {*} ctx 上下文 【必填】 - * @param {*} stepName 步骤名【必填】 - * @param {*} requestName 请求的接口名 【必填】 - * @param {*} field 字段名 【选填】，不传时返回整个请求体 - */ - getStepReqBody: function (ctx, stepName, requestName, field){ - var req = this.getStepReq(ctx, stepName, requestName); - var body = req['body'] || {}; - return field ? body[field] : body; - }, - - /** - * 获取步骤中调用的接口的响应头 - * @param {*} ctx 上下文 【必填】 - * @param {*} stepName 步骤名【必填】 - * @param {*} requestName 请求的接口名 【必填】 - * @param {*} headerName 响应头字段名 【选填】，不传时返回所有响应头 - */ - getStepRespHeader: function (ctx, stepName, requestName, headerName){ - var resp = this.getStepResp(ctx, stepName, requestName); - var headers = resp['headers'] || {}; - return headerName ? headers[headerName.toUpperCase()] : headers; - }, - - /** - * 获取步骤中调用的接口的响应体 - * @param {*} ctx 上下文 【必填】 - * @param {*} stepName 步骤名【必填】 - * @param {*} requestName 请求的接口名 【必填】 - * @param {*} field 字段名 【选填】，不传时返回整个响应体 - */ - getStepRespBody: function (ctx, stepName, requestName, field){ - var resp = this.getStepResp(ctx, stepName, requestName); - var body = resp['body'] || {}; - return field ? body[field] : body; - }, - - /** - * 获取步骤结果 - * @param {*} ctx 上下文 【必填】 - * @param {*} stepName 步骤名【必填】 - * @param {*} field 字段名 【选填】，不传时返回整个步骤结果对象 - */ - getStepResult: function (ctx, stepName, field){ - if(!ctx || !stepName || !ctx[stepName]){ - return {}; - } - var result = ctx[stepName]['result'] || {}; - return field ? result[field] : result; - }, - - /** - * 获取步骤循环结果 - * @param {*} ctx 上下文 【必填】 - * @param {*} stepName 步骤名【必填】 - */ - getStepCircle: function (ctx, stepName){ - if(!ctx || !stepName || !ctx[stepName]){ - return null; - } - // 返回循环结果数组 - return ctx[stepName]['circle']; - }, - - /** - * 获取请求的循环结果 - * @param {*} ctx 上下文 【必填】 - * @param {*} stepName 步骤名【必填】 - */ - getRequestCircle: function (ctx, stepName, requestName){ - if(!ctx || !stepName || !requestName){ - return null; - } - if(!ctx[stepName] || !ctx[stepName]['requests'] || !ctx[stepName]['requests'][requestName] || - !ctx[stepName]['requests'][requestName]['request']){ - return null; - } - // 返回循环结果数组 - return ctx[stepName]['requests'][requestName]['circle']; - } - - /* *********** step request end ************ */ - - ,/** - ** 乘法函数，用来得到精确的乘法结果 - ** 说明：javascript的乘法结果会有误差，在两个浮点数相乘的时候会比较明显。这个函数返回较为精确的乘法结果。 - ** 调用：accMul(arg1,arg2) - ** 返回值：arg1乘以 arg2的精确结果 - **/ - accMul:function (arg1, arg2) { - var m = 0, s1 = arg1.toString(), s2 = arg2.toString(); - try { - m += s1.split(".")[1].length; - } catch (e) { - } - try { - m += s2.split(".")[1].length; - } catch (e) { - } - return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) - / Math.pow(10, m); - }, - - /** - ** 除法函数，用来得到精确的除法结果 - ** 说明：javascript的除法结果会有误差，在两个浮点数相除的时候会比较明显。这个函数返回较为精确的除法结果。 - ** 调用：accDiv(arg1,arg2) - ** 返回值：arg1除以arg2的精确结果 - **/ - accDiv:function (arg1, arg2) { - var t1 = 0, t2 = 0, r1, r2; - try { - t1 = arg1.toString().split(".")[1].length; - } catch (e) { - } - try { - t2 = arg2.toString().split(".")[1].length; - } catch (e) { - } - with (Math) { - r1 = Number(arg1.toString().replace(".", "")); - r2 = Number(arg2.toString().replace(".", "")); - return (r1 / r2) * pow(10, t2 - t1); - } - } - - -}; - - diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index 13ebd0e..48ae0d3 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -57,12 +57,6 @@ ${project.version} - - com.networknt - json-schema-validator-i18n-support - 1.0.39_6 - - - - - repo - file://${project.basedir}/../repo - - - @@ -120,12 +107,6 @@ spring-boot-maven-plugin true - - - com.networknt - json-schema-validator-i18n-support - - diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index 4ac6205..a73096b 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -41,12 +41,6 @@ spring-cloud-commons - - com.networknt - json-schema-validator-i18n-support - 1.0.39_6 - - org.jruby.joni joni @@ -136,46 +130,12 @@ - - - repo - file://${project.basedir}/../repo - - - org.apache.maven.plugins maven-source-plugin - - maven-shade-plugin - 3.2.4 - - false - true - - - com.networknt:json-schema-validator-i18n-support - - - - - com.networknt - com.fizzgate.repackaged.com.networknt - - - - - - package - - shade - - - - \ No newline at end of file diff --git a/fizz-common/src/main/java/com/fizzgate/util/JsonSchemaUtils.java b/fizz-common/src/main/java/com/fizzgate/util/JsonSchemaUtils.java deleted file mode 100644 index 1625391..0000000 --- a/fizz-common/src/main/java/com/fizzgate/util/JsonSchemaUtils.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (C) 2020 the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.fizzgate.util; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.networknt.schema.JsonSchema; -import com.networknt.schema.JsonSchemaFactory; -import com.networknt.schema.SchemaValidatorsConfig; -import com.networknt.schema.SpecVersion; -import com.networknt.schema.ValidationMessage; -import com.networknt.schema.ValidatorTypeCode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.util.CollectionUtils; - -import java.lang.reflect.Field; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * JSON Schema工具类 - * @author zhongjie - */ -public class JsonSchemaUtils { - private static final Logger LOGGER = LoggerFactory.getLogger(JsonSchemaUtils.class); - static { - try { - // 替换验证信息提示 - Field messageFormatField = ValidatorTypeCode.class.getDeclaredField("messageFormat"); - //忽略属性的访问权限 - messageFormatField.setAccessible(true); - messageFormatField.set(ValidatorTypeCode.ADDITIONAL_PROPERTIES, new MessageFormat( - "{1}在schema中没有定义并且schema不允许指定外的字段")); - messageFormatField.set(ValidatorTypeCode.ALL_OF, new MessageFormat("should be valid to all the schemas {1}")); - messageFormatField.set(ValidatorTypeCode.ANY_OF, new MessageFormat("should be valid to any of the schemas {1}")); - messageFormatField.set(ValidatorTypeCode.CROSS_EDITS, new MessageFormat("has an error with 'cross edits'")); - messageFormatField.set(ValidatorTypeCode.DEPENDENCIES, new MessageFormat("has an error with dependencies {1}")); - messageFormatField.set(ValidatorTypeCode.EDITS, new MessageFormat("has an error with 'edits'")); - messageFormatField.set(ValidatorTypeCode.ENUM, new MessageFormat("值不在限定{1}内")); - messageFormatField.set(ValidatorTypeCode.FORMAT, new MessageFormat("不符合{1}格式{2}")); - messageFormatField.set(ValidatorTypeCode.ITEMS, new MessageFormat("在索引[{1}]处为找到验证器")); - messageFormatField.set(ValidatorTypeCode.MAXIMUM, new MessageFormat("给定值应当小于等于{1}")); - messageFormatField.set(ValidatorTypeCode.MAX_ITEMS, new MessageFormat("数组至多含有{1}个元素")); - messageFormatField.set(ValidatorTypeCode.MAX_LENGTH, new MessageFormat("长度应当最多{1}")); - messageFormatField.set(ValidatorTypeCode.MAX_PROPERTIES, new MessageFormat("对象最多有{1}个字段")); - messageFormatField.set(ValidatorTypeCode.MINIMUM, new MessageFormat("给定值应当大于等于{1}")); - messageFormatField.set(ValidatorTypeCode.MIN_ITEMS, new MessageFormat("数组至少含有{1}个元素")); - messageFormatField.set(ValidatorTypeCode.MIN_LENGTH, new MessageFormat("长度应当最少{1}")); - messageFormatField.set(ValidatorTypeCode.MIN_PROPERTIES, new MessageFormat("{0}:对象最少有{1}个字段")); - messageFormatField.set(ValidatorTypeCode.MULTIPLE_OF, new MessageFormat("数值类型应当是{1}")); - messageFormatField.set(ValidatorTypeCode.NOT_ALLOWED, new MessageFormat("{1}不允许出现在数据中")); - messageFormatField.set(ValidatorTypeCode.NOT, new MessageFormat("should not be valid to the schema {1}")); - messageFormatField.set(ValidatorTypeCode.ONE_OF, new MessageFormat("should be valid to one and only one of the schemas {1}")); - messageFormatField.set(ValidatorTypeCode.PATTERN_PROPERTIES, new MessageFormat("has some error with 'pattern properties'")); - messageFormatField.set(ValidatorTypeCode.PATTERN, new MessageFormat("应当符合格式\"{1}\"")); - messageFormatField.set(ValidatorTypeCode.PROPERTIES, new MessageFormat("对象字段存在错误")); - messageFormatField.set(ValidatorTypeCode.READ_ONLY, new MessageFormat("is a readonly field, it cannot be changed")); - messageFormatField.set(ValidatorTypeCode.REF, new MessageFormat("has an error with 'refs'")); - messageFormatField.set(ValidatorTypeCode.REQUIRED, new MessageFormat("{1}字段不能为空")); - messageFormatField.set(ValidatorTypeCode.TYPE, new MessageFormat("预期类型是{2},但实际是{1}")); - messageFormatField.set(ValidatorTypeCode.UNION_TYPE, new MessageFormat("预期类型是{2},但实际是{1}")); - messageFormatField.set(ValidatorTypeCode.UNIQUE_ITEMS, new MessageFormat("数组元素唯一性冲突")); - messageFormatField.set(ValidatorTypeCode.DATETIME, new MessageFormat("{1}不是一个有效的{2}")); - messageFormatField.set(ValidatorTypeCode.UUID, new MessageFormat("{1}不是一个有效的{2}")); - messageFormatField.set(ValidatorTypeCode.ID, new MessageFormat("{1} is an invalid segment for URI {2}")); - messageFormatField.set(ValidatorTypeCode.EXCLUSIVE_MAXIMUM, new MessageFormat("给定值应当小于{1}")); - messageFormatField.set(ValidatorTypeCode.EXCLUSIVE_MINIMUM, new MessageFormat("给定值应当大于{1}")); - messageFormatField.set(ValidatorTypeCode.FALSE, new MessageFormat("Boolean schema false is not valid")); - messageFormatField.set(ValidatorTypeCode.CONST, new MessageFormat("值应当是一个常量{1}")); - messageFormatField.set(ValidatorTypeCode.CONTAINS, new MessageFormat("没有包含元素能够通过验证:{1}")); - } catch (Exception e) { - LOGGER.warn("替换ValidatorTypeCode.messageFormat异常", e); - } - } - - private JsonSchemaUtils() {} - - /** - * 验证JSON字符串是否符合JSON Schema要求 - * @param jsonSchema JSON Schema - * @param inputJson JSON字符串 - * @return null：验证通过，List：报错信息列表 - */ - public static List validate(String jsonSchema, String inputJson) { - return internalValidate(jsonSchema, inputJson, Boolean.FALSE); - } - - /** - * 验证JSON字符串是否符合JSON Schema要求，允许数字\布尔类型 是字符串格式 - * @param jsonSchema JSON Schema - * @param inputJson JSON字符串 - * @return null：验证通过，List：报错信息列表 - */ - public static List validateAllowValueStr(String jsonSchema, String inputJson) { - return internalValidate(jsonSchema, inputJson, Boolean.TRUE); - } - - private static List internalValidate(String jsonSchema, String inputJson, boolean typeLoose) { - CheckJsonResult checkJsonResult = checkJson(jsonSchema, inputJson, typeLoose); - if (checkJsonResult.errorList != null) { - return checkJsonResult.errorList; - } - - Set validationMessageSet = checkJsonResult.schema.validate(checkJsonResult.json); - if (CollectionUtils.isEmpty(validationMessageSet)) { - return null; - } - - return validationMessageSet.stream().map(validationMessage -> { - String message = validationMessage.getMessage(); - if (message != null) { - return message; - } - return validationMessage.getCode(); - }).collect(Collectors.toList()); - } - - private static CheckJsonResult checkJson(String jsonSchema, String inputJson, boolean typeLoose) { - CheckJsonResult checkJsonResult = new CheckJsonResult(); - try { - checkJsonResult.schema = getJsonSchemaFromStringContent(jsonSchema, typeLoose); - } catch (Exception e) { - checkJsonResult.errorList = new ArrayList<>(1); - checkJsonResult.errorList.add(String.format("JSON Schema格式错误，提示信息[%s]", e.getMessage())); - return checkJsonResult; - } - - try { - checkJsonResult.json = getJsonNodeFromStringContent(inputJson); - } catch (Exception e) { - checkJsonResult.errorList = new ArrayList<>(1); - checkJsonResult.errorList.add(String.format("待验证JSON格式错误，提示信息[%s]", e.getMessage())); - return checkJsonResult; - } - - return checkJsonResult; - } - - private static class CheckJsonResult { - JsonSchema schema; - JsonNode json; - List errorList; - } - - private static final JsonSchemaFactory JSON_SCHEMA_FACTORY = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7); - private static final SchemaValidatorsConfig CONFIG_WITH_TYPE_LOOSE; - private static final SchemaValidatorsConfig CONFIG_WITHOUT_TYPE_LOOSE; - private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); - static { - CONFIG_WITH_TYPE_LOOSE = new SchemaValidatorsConfig(); - CONFIG_WITH_TYPE_LOOSE.setTypeLoose(Boolean.TRUE); - CONFIG_WITHOUT_TYPE_LOOSE = new SchemaValidatorsConfig(); - CONFIG_WITHOUT_TYPE_LOOSE.setTypeLoose(Boolean.FALSE); - } - private static JsonSchema getJsonSchemaFromStringContent(String schemaContent, boolean typeLoose) { - SchemaValidatorsConfig config = typeLoose ? CONFIG_WITH_TYPE_LOOSE : CONFIG_WITHOUT_TYPE_LOOSE; - return JSON_SCHEMA_FACTORY.getSchema(schemaContent, config); - } - - private static JsonNode getJsonNodeFromStringContent(String content) throws Exception { - return OBJECT_MAPPER.readTree(content); - } -} diff --git a/fizz-common/src/test/java/com/fizzgate/util/JsonSchemaUtilsTest.java b/fizz-common/src/test/java/com/fizzgate/util/JsonSchemaUtilsTest.java deleted file mode 100644 index 5a6b705..0000000 --- a/fizz-common/src/test/java/com/fizzgate/util/JsonSchemaUtilsTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2020 the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.fizzgate.util; - -import org.junit.jupiter.api.Test; -import com.fizzgate.schema.util.I18nUtils; -import java.util.List; -import java.util.Locale; - -import static org.junit.jupiter.api.Assertions.*; - -class JsonSchemaUtilsTest { - - @Test - void validateRequiredPropertyWithoutAssignedTitleAndTitleEn() { - I18nUtils.setContextLocale(new Locale("zh")); - try { - List validateList = JsonSchemaUtils.validate( - "{\n" + - " \"properties\": {\n" + - " \"library\": {\n" + - " \"type\": \"object\",\n" + - " \"required\": [\n" + - " \"person\"\n" + - " ],\n" + - " \"properties\": {\n" + - " \"person\": {\n" + - " \"type\": \"string\"\n" + - " }\n" + - " }\n" + - " }\n" + - " },\n" + - " \"required\": [\n" + - " \"library\"\n" + - " ],\n" + - " \"type\": [\n" + - " \"object\",\n" + - " \"null\"\n" + - " ]\n" + - "}", - "{\n" + - " \"library\":{\n" + - " }\n" + - "}"); - assertNotNull(validateList); - assertEquals(1, validateList.size()); - assertEquals("person不能为空", validateList.get(0)); - } finally { - I18nUtils.removeContextLocale(); - } - } -} \ No newline at end of file diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml index f227aee..76aac1f 100644 --- a/fizz-core/pom.xml +++ b/fizz-core/pom.xml @@ -34,22 +34,9 @@ disruptor - - com.networknt - json-schema-validator-i18n-support - 1.0.39_6 - provided - - com.fizzgate fizz-common - - - com.networknt - json-schema-validator-i18n-support - - @@ -328,10 +315,6 @@ - - repo - file://${project.basedir}/../repo - sonatype-snapshots SonaType Snapshots diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml index ce1b3ad..e85db8e 100644 --- a/fizz-plugin/pom.xml +++ b/fizz-plugin/pom.xml @@ -19,12 +19,6 @@ com.fizzgate fizz-common - - - com.networknt - json-schema-validator-i18n-support - - com.fizzgate diff --git a/fizz-plugin/src/test/java/com/fizzgate/plugin/grayrelease/GrayReleasePluginTests.java b/fizz-plugin/src/test/java/com/fizzgate/plugin/grayrelease/GrayReleasePluginTests.java index ca2d909..5a8dd6d 100644 --- a/fizz-plugin/src/test/java/com/fizzgate/plugin/grayrelease/GrayReleasePluginTests.java +++ b/fizz-plugin/src/test/java/com/fizzgate/plugin/grayrelease/GrayReleasePluginTests.java @@ -1,6 +1,8 @@ package com.fizzgate.plugin.grayrelease; import com.fasterxml.jackson.core.type.TypeReference; +import com.fizzgate.aggregate.web.filter.AggregateFilter; +import com.fizzgate.aggregate.web.loader.ConfigLoader; import com.fizzgate.filter.FilterResult; import com.fizzgate.plugin.FizzPluginFilterChain; import com.fizzgate.plugin.auth.ApiConfig; @@ -141,7 +143,7 @@ public class GrayReleasePluginTests { @Test public void aggregateBackendTest() { - AggregateFilter aggregateFilter = new AggregateFilter(); + AggregateFilter aggregateFilter = new AggregateFilter(null, null, null); ConfigLoader configLoader = mock(ConfigLoader.class); when( configLoader.matchAggregateResource("GET", "/_proxytest/bservice/bpath/xxx") diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml index 9be4d4b..ed6769b 100644 --- a/fizz-spring-boot-starter/pom.xml +++ b/fizz-spring-boot-starter/pom.xml @@ -245,12 +245,6 @@ com.fizzgate fizz-common - - - com.networknt - json-schema-validator-i18n-support - - com.fizzgate diff --git a/pom.xml b/pom.xml index a7a8cee..a81405a 100644 --- a/pom.xml +++ b/pom.xml @@ -98,12 +98,6 @@ com.fizzgate fizz-common ${project.version} - - - com.networknt - json-schema-validator-i18n-support - - com.fizzgate diff --git a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.jar b/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.jar deleted file mode 100644 index b37291a..0000000 Binary files a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.jar and /dev/null differ diff --git a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.pom b/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.pom deleted file mode 100644 index 399230b..0000000 --- a/repo/com/networknt/json-schema-validator-i18n-support/1.0.39_6/json-schema-validator-i18n-support-1.0.39_6.pom +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - com.networknt - json-schema-validator-i18n-support - 1.0.39_6 - POM was created from install:install-file - JsonSchemaValidator - - 1.8 - 1.8 - UTF-8 - 2.10.0 - 1.7.25 - 3.5 - 2.1.31 - 1.2.3 - 4.12 - 2.7.21 - 1.3 - 2.0.29.Final - - - - com.fasterxml.jackson.core - jackson-databind - ${version.jackson} - - - org.slf4j - slf4j-api - ${version.slf4j} - - - org.apache.commons - commons-lang3 - ${version.common-lang3} - - - org.jruby.joni - joni - ${version.joni} - - - ch.qos.logback - logback-classic - ${version.logback} - test - - - junit - junit - ${version.junit} - test - - - org.mockito - mockito-core - ${version.mockito} - test - - - org.hamcrest - hamcrest-all - ${version.hamcrest} - test - - - io.undertow - undertow-core - ${version.undertow} - test - - - diff --git a/repo/com/networknt/json-schema-validator-i18n-support/maven-metadata-local.xml b/repo/com/networknt/json-schema-validator-i18n-support/maven-metadata-local.xml deleted file mode 100644 index 614a6a4..0000000 --- a/repo/com/networknt/json-schema-validator-i18n-support/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - com.networknt - json-schema-validator-i18n-support - - 1.0.39_6 - - 1.0.39_6 - - 20210430081305 - -