This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new a7e785e10 update version in dubbo-samples-validation (#1066)
a7e785e10 is described below
commit a7e785e103ea00d185f308445114992d24272873
Author: MiSinG <[email protected]>
AuthorDate: Sun Mar 24 10:57:52 2024 +0800
update version in dubbo-samples-validation (#1066)
---
.../case-configuration.yml | 47 ++++++-
.../dubbo-samples-validation/case-versions.conf | 6 +-
2-advanced/dubbo-samples-validation/pom.xml | 144 +++++++++------------
.../samples/validation/ValidationConsumer.java | 28 ++--
.../samples/validation/ValidationProvider.java | 15 +--
.../validation/api/ValidationParameter.java | 1 +
.../validation/impl/ValidationServiceImpl.java | 2 +
.../main/resources/application.yml} | 22 ++--
.../src/main/resources/log4j2.xml | 29 -----
.../main/resources/spring/validation-consumer.xml | 33 -----
.../main/resources/spring/validation-provider.xml | 39 ------
.../samples/validation/ValidationServiceIT.java | 26 ++--
12 files changed, 160 insertions(+), 232 deletions(-)
diff --git a/2-advanced/dubbo-samples-validation/case-configuration.yml
b/2-advanced/dubbo-samples-validation/case-configuration.yml
index 7829c0493..b83f3ef49 100644
--- a/2-advanced/dubbo-samples-validation/case-configuration.yml
+++ b/2-advanced/dubbo-samples-validation/case-configuration.yml
@@ -14,11 +14,46 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from: app-builtin-zookeeper.yml
+#from: app-builtin-zookeeper.yml
+#
+#props:
+# project_name: dubbo-samples-validation
+# main_class: org.apache.dubbo.samples.validation.ValidationProvider
+# zookeeper_port: 2181
+# dubbo_port: 20880
+
+services:
+ zookeeper:
+ image: zookeeper:latest
+
+ provider:
+ type: app
+ basedir: .
+ mainClass: org.apache.dubbo.samples.validation.ValidationProvider
+ systemProps:
+ - zookeeper.address=zookeeper
+ waitPortsBeforeRun:
+ - zookeeper:2181
+ checkPorts:
+ - 20880
+ checkLog: "dubbo service started"
+ depends_on:
+ - zookeeper
-props:
- project_name: dubbo-samples-validation
- main_class: org.apache.dubbo.samples.validation.ValidationProvider
- zookeeper_port: 2181
- dubbo_port: 20880
+ direct-consumer:
+ type: test
+ basedir: .
+ tests:
+ - "**/*IT.class"
+ systemProps:
+ - zookeeper.address=zookeeper
+ - zookeeper.port=2181
+ - dubbo.address=provider
+ - dubbo.port=20880
+ waitPortsBeforeRun:
+ - zookeeper:2181
+ - provider:20880
+ depends_on:
+ - provider
+ - zookeeper
diff --git a/2-advanced/dubbo-samples-validation/case-versions.conf
b/2-advanced/dubbo-samples-validation/case-versions.conf
index f7373a530..82aeb4560 100644
--- a/2-advanced/dubbo-samples-validation/case-versions.conf
+++ b/2-advanced/dubbo-samples-validation/case-versions.conf
@@ -20,6 +20,6 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
-spring.version=4.*, 5.*
-java.version= [>= 8]
+dubbo.version=3.3.*
+spring.version=6.*
+java.version= [>= 17]
diff --git a/2-advanced/dubbo-samples-validation/pom.xml
b/2-advanced/dubbo-samples-validation/pom.xml
index aa39acee6..ad31f5b1a 100644
--- a/2-advanced/dubbo-samples-validation/pom.xml
+++ b/2-advanced/dubbo-samples-validation/pom.xml
@@ -29,149 +29,121 @@
<description>Dubbo Samples Validation</description>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <dubbo.version>3.3.0-beta.1</dubbo.version>
+ <spring-boot.version>3.2.3</spring-boot.version>
- <dubbo.version>3.2.6</dubbo.version>
- <spring.version>4.3.30.RELEASE</spring.version>
- <log4j2.version>2.20.0</log4j2.version>
- <junit.version>4.13.1</junit.version>
+ <junit5.version>5.10.1</junit5.version>
+ <junit.version>4.13.2</junit.version>
+ <log4j2.version>2.0.11</log4j2.version>
+ <jupiter.version>5.9.3</jupiter.version>
<validation.api.version>2.0.1.Final</validation.api.version>
- <hibernate.validator.version>6.1.2.Final</hibernate.validator.version>
<javax.el.version>3.0.0</javax.el.version>
-
+ <hibernate.validator.version>6.1.5.Final</hibernate.validator.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-framework-bom</artifactId>
- <version>${spring.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-bom</artifactId>
- <version>${dubbo.version}</version>
- <type>pom</type>
- <scope>import</scope>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ <version>${spring-boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
+ <artifactId>dubbo-bom</artifactId>
<version>${dubbo.version}</version>
<type>pom</type>
- <exclusions>
- <exclusion>
- <artifactId>logback-classic</artifactId>
- <groupId>ch.qos.logback</groupId>
- </exclusion>
- <exclusion>
- <artifactId>logback-core</artifactId>
- <groupId>ch.qos.logback</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
+ <scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo</artifactId>
- </dependency>
+ <!-- dubbo -->
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
- <type>pom</type>
+ <artifactId>dubbo-spring-boot-starter</artifactId>
+ <version>${dubbo.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j2.version}</version>
+ <groupId>org.apache.dubbo</groupId>
+
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
+ <version>${dubbo.version}</version>
</dependency>
+ <!-- spring starter -->
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${validation.api.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>${hibernate.validator.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ <version>${spring-boot.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>${javax.el.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ <version>${spring-boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
+ <version>${junit.version}</version>
</dependency>
+ <!--validation-->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${validation.api.version}</version>
</dependency>
-
- <!-- Embedded Zookeeper Server Dependencies -->
<dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>4.1.12.1</version>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ <version>${javax.el.version}</version>
</dependency>
<dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>1.1.10.5</version>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate.validator.version}</version>
</dependency>
</dependencies>
- <profiles>
- <!-- For jdk 11 above JavaEE annotation -->
- <profile>
- <id>javax.annotation</id>
- <activation>
- <jdk>[1.11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git
a/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/ValidationConsumer.java
b/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/ValidationConsumer.java
index 5d3f6f2ba..c77e3e555 100644
---
a/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/ValidationConsumer.java
+++
b/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/ValidationConsumer.java
@@ -19,26 +19,38 @@
package org.apache.dubbo.samples.validation;
+
+
+
+import javax.validation.ValidationException;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.apache.dubbo.samples.validation.api.ValidationParameter;
import org.apache.dubbo.samples.validation.api.ValidationService;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import javax.validation.ValidationException;
-import java.util.Date;
+import java.util.Date;
+@SpringBootApplication()
+@EnableDubbo
public class ValidationConsumer {
- public static void main(String[] args) throws Exception {
- ClassPathXmlApplicationContext context = new
ClassPathXmlApplicationContext("spring/validation-consumer.xml");
- context.start();
- ValidationService validationService = (ValidationService)
context.getBean("validationService");
+ @DubboReference
+ private ValidationService validationService;
+
+ public static void main(String[] args) throws Exception {
+ SpringApplication.run(ValidationConsumer.class,args);
+ }
+ public void validation(){
// Save OK
ValidationParameter parameter = new ValidationParameter();
- parameter.setName("liangfei");
- parameter.setEmail("[email protected]");
+ parameter.setName("yang siming");
+ parameter.setEmail("[email protected]");
parameter.setAge(50);
parameter.setLoginDate(new Date(System.currentTimeMillis() - 1000000));
parameter.setExpiryDate(new Date(System.currentTimeMillis() +
1000000));
diff --git
a/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/ValidationProvider.java
b/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/ValidationProvider.java
index 9f9278f08..b042ac52f 100644
---
a/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/ValidationProvider.java
+++
b/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/ValidationProvider.java
@@ -19,20 +19,17 @@
package org.apache.dubbo.samples.validation;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import java.util.concurrent.CountDownLatch;
-
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+@SpringBootApplication
+@EnableDubbo
public class ValidationProvider {
public static void main(String[] args) throws Exception {
new EmbeddedZooKeeper(2181, false).start();
-
- ClassPathXmlApplicationContext context = new
ClassPathXmlApplicationContext("spring/validation-provider.xml");
- context.start();
-
+ SpringApplication.run(ValidationProvider.class,args);
System.out.println("dubbo service started");
- new CountDownLatch(1).await();
}
}
diff --git
a/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/api/ValidationParameter.java
b/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/api/ValidationParameter.java
index cd344c72f..8b0729d2b 100644
---
a/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/api/ValidationParameter.java
+++
b/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/api/ValidationParameter.java
@@ -26,6 +26,7 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Past;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
+
import java.io.Serializable;
import java.util.Date;
diff --git
a/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/impl/ValidationServiceImpl.java
b/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/impl/ValidationServiceImpl.java
index c6e2ce708..3080a72fb 100644
---
a/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/impl/ValidationServiceImpl.java
+++
b/2-advanced/dubbo-samples-validation/src/main/java/org/apache/dubbo/samples/validation/impl/ValidationServiceImpl.java
@@ -19,12 +19,14 @@
package org.apache.dubbo.samples.validation.impl;
+import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.samples.validation.api.ValidationParameter;
import org.apache.dubbo.samples.validation.api.ValidationService;
/**
* ValidationServiceImpl
*/
+@DubboService(interfaceClass = ValidationService.class)
public class ValidationServiceImpl implements ValidationService {
@Override
diff --git a/2-advanced/dubbo-samples-validation/case-versions.conf
b/2-advanced/dubbo-samples-validation/src/main/resources/application.yml
similarity index 73%
copy from 2-advanced/dubbo-samples-validation/case-versions.conf
copy to 2-advanced/dubbo-samples-validation/src/main/resources/application.yml
index f7373a530..af7817fc7 100644
--- a/2-advanced/dubbo-samples-validation/case-versions.conf
+++ b/2-advanced/dubbo-samples-validation/src/main/resources/application.yml
@@ -1,5 +1,4 @@
#
-#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -16,10 +15,17 @@
# limitations under the License.
#
-
-# Supported component versions of the test case
-
-# Spring app
-dubbo.version=2.7*, 3.*
-spring.version=4.*, 5.*
-java.version= [>= 8]
+spring:
+ application:
+ name: validation-provider
+dubbo:
+ application:
+ qos-enable: false
+ protocol:
+ port: -1
+ consumer:
+ validation: true
+ provider:
+ validation: true
+ registry:
+ address: zookeeper://${zookeeper.address:127.0.0.1}:2181
diff --git a/2-advanced/dubbo-samples-validation/src/main/resources/log4j2.xml
b/2-advanced/dubbo-samples-validation/src/main/resources/log4j2.xml
deleted file mode 100644
index 69e1321d2..000000000
--- a/2-advanced/dubbo-samples-validation/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<Configuration status="WARN">
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="%style{%d{HH:mm:ss.SSS}}{Magenta}
%style{|-}{White}%highlight{%-5p} [%t] %style{%40.40c}{Cyan}:%style{%-3L}{Blue}
%style{-|}{White}
%m%n%rEx{filters(jdk.internal.reflect,java.lang.reflect,sun.reflect)}"
disableAnsi="false" charset="UTF-8"/>
- </Console>
- </Appenders>
- <Loggers>
- <Root level="info">
- <AppenderRef ref="Console"/>
- </Root>
- </Loggers>
-</Configuration>
diff --git
a/2-advanced/dubbo-samples-validation/src/main/resources/spring/validation-consumer.xml
b/2-advanced/dubbo-samples-validation/src/main/resources/spring/validation-consumer.xml
deleted file mode 100644
index 159bb34bf..000000000
---
a/2-advanced/dubbo-samples-validation/src/main/resources/spring/validation-consumer.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:dubbo="http://dubbo.apache.org/schema/dubbo";
- xmlns="http://www.springframework.org/schema/beans";
xmlns:context="http://www.springframework.org/schema/context";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://dubbo.apache.org/schema/dubbo
http://dubbo.apache.org/schema/dubbo/dubbo.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd";>
- <context:property-placeholder/>
-
- <dubbo:application name="validation-consumer"/>
-
- <dubbo:registry
address="zookeeper://${zookeeper.address:127.0.0.1}:${zookeeper.port:2181}"/>
-
- <dubbo:reference id="validationService"
interface="org.apache.dubbo.samples.validation.api.ValidationService"
- validation="true"/>
-
-</beans>
diff --git
a/2-advanced/dubbo-samples-validation/src/main/resources/spring/validation-provider.xml
b/2-advanced/dubbo-samples-validation/src/main/resources/spring/validation-provider.xml
deleted file mode 100644
index 5e9b573f6..000000000
---
a/2-advanced/dubbo-samples-validation/src/main/resources/spring/validation-provider.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:dubbo="http://dubbo.apache.org/schema/dubbo";
- xmlns="http://www.springframework.org/schema/beans";
xmlns:context="http://www.springframework.org/schema/context";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://dubbo.apache.org/schema/dubbo
http://dubbo.apache.org/schema/dubbo/dubbo.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd";>
- <context:property-placeholder/>
-
- <dubbo:application name="validation-provider"/>
-
- <dubbo:registry
address="zookeeper://${zookeeper.address:127.0.0.1}:${zookeeper.port:2181}"/>
-
- <dubbo:provider token="true"/>
-
- <dubbo:protocol name="dubbo" port="20880"/>
-
- <bean id="validationService"
class="org.apache.dubbo.samples.validation.impl.ValidationServiceImpl"/>
-
- <dubbo:service
interface="org.apache.dubbo.samples.validation.api.ValidationService"
ref="validationService"
- validation="true"/>
-
-</beans>
diff --git
a/2-advanced/dubbo-samples-validation/src/test/java/org/apache/dubbo/samples/validation/ValidationServiceIT.java
b/2-advanced/dubbo-samples-validation/src/test/java/org/apache/dubbo/samples/validation/ValidationServiceIT.java
index 541f23afc..aed4b758a 100644
---
a/2-advanced/dubbo-samples-validation/src/test/java/org/apache/dubbo/samples/validation/ValidationServiceIT.java
+++
b/2-advanced/dubbo-samples-validation/src/test/java/org/apache/dubbo/samples/validation/ValidationServiceIT.java
@@ -17,29 +17,33 @@
package org.apache.dubbo.samples.validation;
+
+import javax.validation.ValidationException;
+import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.samples.validation.api.ValidationParameter;
import org.apache.dubbo.samples.validation.api.ValidationService;
-
import org.junit.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.junit4.SpringRunner;
-import javax.validation.ValidationException;
import java.util.Date;
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations =
{"classpath:/spring/validation-consumer.xml"})
+@SpringBootTest(classes = {ValidationConsumer.class})
+@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
public class ValidationServiceIT {
- @Autowired
+
+ @DubboReference
private ValidationService validationService;
@Test
public void testSavePass() throws Exception {
ValidationParameter parameter = new ValidationParameter();
- parameter.setName("liangfei");
- parameter.setEmail("[email protected]");
+ parameter.setName("yang siming");
+ parameter.setEmail("[email protected]");
parameter.setAge(50);
parameter.setLoginDate(new Date(System.currentTimeMillis() - 1000000));
parameter.setExpiryDate(new Date(System.currentTimeMillis() +
1000000));
@@ -47,7 +51,7 @@ public class ValidationServiceIT {
}
@Test(expected = ValidationException.class)
- public void testSaveFail() throws Exception {
+ public void testSaveFail() {
ValidationParameter parameter = new ValidationParameter();
validationService.save(parameter);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
