refactor dubbo-samples-direct

2-advanced/dubbo-samples-direct/case-configuration.yml

@@ -14,9 +14,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from: app-external-zookeeper.yml
+services:
+
+  direct-provider:
+    type: app
+    basedir: dubbo-samples-direct-provider
+    mainClass: org.apache.dubbo.samples.direct.DirectProviderApplication
+#    systemProps:
+#      - zookeeper.address=zookeeper
+#    waitPortsBeforeRun:
+#      - zookeeper:2181
+#    checkPorts:
+#      - 20880
+#    checkLog: "Current Spring Boot Application is await..."
+  direct-consumer:
+    type: test
+    basedir: dubbo-samples-direct-consumer
+    tests:
+      - "**/*IT.class"
+    systemProps:
+      - zookeeper.address=direct-provider
+      - zookeeper.port=2181
+      - dubbo.address=direct-provider
+      - dubbo.port=20880
+    waitPortsBeforeRun:
+      - direct-provider:2181
+      - direct-provider:20880
+    depends_on:
+      - direct-provider
 
-props:
-  project_name: dubbo-samples-direct
-  main_class: org.apache.dubbo.samples.direct.DirectProvider
-  dubbo_port: 20880

2-advanced/dubbo-samples-direct/dubbo-samples-direct-consumer/pom.xml

@@ -0,0 +1,84 @@
+<?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.
+  -->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dubbo-samples-direct</artifactId>
+        <groupId>org.apache.dubbo</groupId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>dubbo-samples-direct-consumer</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-samples-direct-interface</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
+        <!-- dubbo -->
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-dependencies-zookeeper</artifactId>
+            <type>pom</type>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-reload4j</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- spring starter -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

2-advanced/dubbo-samples-direct/dubbo-samples-direct-consumer/src/main/java/org/apache/dubbo/samples/direct/DirectConsumerApplication.java

@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+
+package org.apache.dubbo.samples.direct;
+
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+@EnableDubbo
+public class DirectConsumerApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(DirectConsumerApplication.class,args);
+    }
+}

2-advanced/dubbo-samples-direct/dubbo-samples-direct-consumer/src/main/java/org/apache/dubbo/samples/direct/Task.java

@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+package org.apache.dubbo.samples.direct;
+
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.dubbo.samples.direct.api.DirectService;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+
+
+@Component
+public class Task implements CommandLineRunner {
+    @DubboReference(interfaceClass = DirectService.class,
+            check = false,
+            group = "test",
+            version = "1.0.0-daily")
+    private DirectService directService;
+
+    @Override
+    public void run(String... args) throws Exception {
+        String hello = directService.sayHello("world");
+        System.out.println(hello);
+
+    }
+}

2-advanced/dubbo-samples-direct/dubbo-samples-direct-consumer/src/main/resources/application.yml

@@ -0,0 +1,24 @@
+# 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.
+dubbo:
+  application:
+    name: direct-consumer
+    qos-enable: false
+  protocol:
+    name: dubbo
+    port: -1
+  registry:
+    address: zookeeper://${zookeeper.address:127.0.0.1}:2181

2-advanced/dubbo-samples-direct/src/test/java/org/apache/dubbo/samples/direct/DirectServiceIT.java → 2-advanced/dubbo-samples-direct/dubbo-samples-direct-consumer/src/test/java/org/apache/dubbo/samples/direct/DirectServiceIT.java

@@ -17,40 +17,47 @@
 
 package org.apache.dubbo.samples.direct;
 
+import junit.framework.TestCase;
 import org.apache.dubbo.config.ApplicationConfig;
 import org.apache.dubbo.config.ReferenceConfig;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.rpc.service.GenericService;
 import org.apache.dubbo.samples.direct.api.DirectService;
-
-import junit.framework.TestCase;
 import org.junit.Assert;
 import org.junit.Test;
 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.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath*:/spring/dubbo-direct-consumer.xml"})
+@SpringBootTest
+@RunWith(SpringRunner.class)
 public class DirectServiceIT {
     private static String providerAddress = System.getProperty("dubbo.address", "localhost");
 
-    @Autowired
+    @DubboReference(interfaceClass = DirectService.class,
+                    check = false,
+                    group = "test",
+                    version = "1.0.0-daily")
     private DirectService directService;
 
+
+
     @Test
     public void testXml() throws Exception {
+
         Assert.assertTrue(directService.sayHello("dubbo").startsWith("Hello dubbo"));
     }
 
     @Test
     public void testGeneric() throws Exception {
+
         ApplicationConfig application = new ApplicationConfig();
         application.setName("direct-consumer");
+        System.out.println(application.getClass());
         ReferenceConfig<GenericService> reference = new ReferenceConfig<>();
         reference.setUrl("dubbo://" + providerAddress + ":20880/" + DirectService.class.getName());
-        reference.setVersion("1.0.0-daily");
-        reference.setGroup("test2");
+       reference.setVersion("1.0.0-daily");
+       reference.setGroup("test2");
         reference.setGeneric(true);
         reference.setApplication(application);
         reference.setInterface(DirectService.class.getName());

2-advanced/dubbo-samples-direct/dubbo-samples-direct-interface/pom.xml

@@ -0,0 +1,33 @@
+<?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.
+  -->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <artifactId>dubbo-samples-direct</artifactId>
+        <groupId>org.apache.dubbo</groupId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>dubbo-samples-direct-interface</artifactId>
+
+</project>

2-advanced/dubbo-samples-direct/dubbo-samples-direct-interface/src/main/java/org/apache/dubbo/samples/direct/api/DirectService.java

@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+package org.apache.dubbo.samples.direct.api;
+
+public interface DirectService {
+    String sayHello(String name);
+}