This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 0bfdcaccceb6adccba821f4034469b4dd97a82b4
Author: acsukesh <sukes...@huawei.com>
AuthorDate: Fri Mar 30 19:04:50 2018 +0530
[SCB-292] chassis support standard parameter validation
---
java-chassis-dependencies/pom.xml | 5 +++++
java-chassis-distribution/pom.xml | 4 ++++
swagger/swagger-invocation/invocation-core/pom.xml | 10 +---------
.../extension/ProducerInvokeExtension.java | 4 +---
...vocation.exception.ExceptionToResponseConverter | 1 -
.../pom.xml | 23 +++++++++-------------
...raintViolationExceptionToResponseConverter.java | 2 +-
.../invocation/validator}/ParameterValidator.java | 8 +++++++-
...ocation.exception.ExceptionToResponseConverter} | 2 +-
...er.invocation.extension.ProducerInvokeExtension | 2 +-
swagger/swagger-invocation/pom.xml | 1 +
11 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/java-chassis-dependencies/pom.xml
b/java-chassis-dependencies/pom.xml
index 02af808..92a0047 100644
--- a/java-chassis-dependencies/pom.xml
+++ b/java-chassis-dependencies/pom.xml
@@ -901,6 +901,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
+ <artifactId>swagger-invocation-validator</artifactId>
+ <version>1.0.0-m2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
<artifactId>service-registry</artifactId>
<version>1.0.0-m2-SNAPSHOT</version>
</dependency>
diff --git a/java-chassis-distribution/pom.xml
b/java-chassis-distribution/pom.xml
index 95b30e1..ebaa667 100644
--- a/java-chassis-distribution/pom.xml
+++ b/java-chassis-distribution/pom.xml
@@ -90,6 +90,10 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
+ <artifactId>swagger-invocation-validator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-common</artifactId>
</dependency>
<dependency>
diff --git a/swagger/swagger-invocation/invocation-core/pom.xml
b/swagger/swagger-invocation/invocation-core/pom.xml
index 492be2e..b7a367e 100644
--- a/swagger/swagger-invocation/invocation-core/pom.xml
+++ b/swagger/swagger-invocation/invocation-core/pom.xml
@@ -38,14 +38,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
@@ -56,4 +48,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/extension/ProducerInvokeExtension.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/extension/ProducerInvokeExtension.java
index efa1b9c..e559124 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/extension/ProducerInvokeExtension.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/extension/ProducerInvokeExtension.java
@@ -22,9 +22,7 @@ import
org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
public interface ProducerInvokeExtension {
- default int getOrder() {
- return 0;
- }
+ public int getOrder();
<T> void beforeMethodInvoke(SwaggerInvocation invocation,
SwaggerProducerOperation producerOperation,
Object[] args) throws Exception;
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
index 1d0e0bc..b717491 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
+++
b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
@@ -17,4 +17,3 @@
org.apache.servicecomb.swagger.invocation.exception.InvocationExceptionToResponseConverter
org.apache.servicecomb.swagger.invocation.exception.DefaultExceptionToResponseConverter
-org.apache.servicecomb.swagger.invocation.extension.ConstraintViolationExceptionToResponseConverter
\ No newline at end of file
diff --git a/swagger/swagger-invocation/invocation-core/pom.xml
b/swagger/swagger-invocation/invocation-validator/pom.xml
similarity index 75%
copy from swagger/swagger-invocation/invocation-core/pom.xml
copy to swagger/swagger-invocation/invocation-validator/pom.xml
index 492be2e..b0eb754 100644
--- a/swagger/swagger-invocation/invocation-core/pom.xml
+++ b/swagger/swagger-invocation/invocation-validator/pom.xml
@@ -23,28 +23,23 @@
<artifactId>swagger-invocation</artifactId>
<version>1.0.0-m2-SNAPSHOT</version>
</parent>
- <artifactId>swagger-invocation-core</artifactId>
- <name>Java Chassis::Swagger::Invocation::Core</name>
+ <artifactId>swagger-invocation-validator</artifactId>
+ <name>Java Chassis::Swagger::Invocation::Validator</name>
<dependencies>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>swagger-generator-core</artifactId>
+ <artifactId>swagger-invocation-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>swagger-generator-jaxrs</artifactId>
- <scope>test</scope>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- </dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -56,4 +51,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/extension/ConstraintViolationExceptionToResponseConverter.java
b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToResponseConverter.java
similarity index 96%
rename from
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/extension/ConstraintViolationExceptionToResponseConverter.java
rename to
swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToResponseConverter.java
index 98a1412..61c2c30 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/extension/ConstraintViolationExceptionToResponseConverter.java
+++
b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToResponseConverter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.swagger.invocation.extension;
+package org.apache.servicecomb.swagger.invocation.validator;
import javax.validation.ConstraintViolationException;
import javax.ws.rs.core.Response.Status;
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/extension/ParameterValidator.java
b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java
similarity index 91%
rename from
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/extension/ParameterValidator.java
rename to
swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java
index 7372377..a2ed0c6 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/extension/ParameterValidator.java
+++
b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.swagger.invocation.extension;
+package org.apache.servicecomb.swagger.invocation.validator;
import java.util.Set;
@@ -27,6 +27,7 @@ import javax.validation.groups.Default;
import org.apache.servicecomb.swagger.engine.SwaggerProducerOperation;
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
+import
org.apache.servicecomb.swagger.invocation.extension.ProducerInvokeExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,4 +57,9 @@ public class ParameterValidator implements
ProducerInvokeExtension {
}
}
+ @Override
+ public int getOrder() {
+ return 100;
+ }
+
}
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.extension.ProducerInvokeExtension
b/swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
similarity index 88%
copy from
swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.extension.ProducerInvokeExtension
copy to
swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
index a532fe7..9667b7a 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.extension.ProducerInvokeExtension
+++
b/swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.servicecomb.swagger.invocation.extension.ParameterValidator
+org.apache.servicecomb.swagger.invocation.validator.ConstraintViolationExceptionToResponseConverter
\ No newline at end of file
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.extension.ProducerInvokeExtension
b/swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.extension.ProducerInvokeExtension
similarity index 92%
rename from
swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.extension.ProducerInvokeExtension
rename to
swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.extension.ProducerInvokeExtension
index a532fe7..215fc56 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.extension.ProducerInvokeExtension
+++
b/swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.extension.ProducerInvokeExtension
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.servicecomb.swagger.invocation.extension.ParameterValidator
+org.apache.servicecomb.swagger.invocation.validator.ParameterValidator
diff --git a/swagger/swagger-invocation/pom.xml
b/swagger/swagger-invocation/pom.xml
index b22339c..515db2c 100644
--- a/swagger/swagger-invocation/pom.xml
+++ b/swagger/swagger-invocation/pom.xml
@@ -30,5 +30,6 @@
<module>invocation-core</module>
<module>invocation-jaxrs</module>
<module>invocation-springmvc</module>
+ <module>invocation-validator</module>
</modules>
</project>
--
To stop receiving notification emails like this one, please contact
liu...@apache.org.
