feat: 抽取properties及configuration

杜云山
1 parent 40f3a57b
Showing 7 changed files with 84 additions and 75 deletions Show diff stats
src/main/java/com/example/mina/config/AbstractVirtualBoxConfiguration.java
src/main/java/com/example/mina/config/AeroflexVirtualBoxConfiguration.java
src/main/java/com/example/mina/config/Rbm3000VirtualBoxConfiguration.java
src/main/java/com/example/mina/property/AbstractVirtualBoxProperties.java
src/main/java/com/example/mina/property/AeroflexVirtualBoxProperties.java
src/main/java/com/example/mina/property/Rbm3000VitualBoxProperties.java
src/main/resources/application.yml
@@ -0,0 +1,56 @@
+package com.example.mina.config;
+
+import com.example.mina.base.AbstractVirtualBoxHandler;
+import com.example.mina.property.AbstractVirtualBoxProperties;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+
+import java.net.InetSocketAddress;
+
+/**
+ * @author 杜云山
+ * @date 21/03/05
+ */
+@Slf4j
+public class AbstractVirtualBoxConfiguration implements ApplicationRunner {
+
+    private final AbstractVirtualBoxProperties abstractVirtualBoxProperties;
+
+    private final AbstractVirtualBoxHandler abstractVirtualBoxHandler;
+
+    public AbstractVirtualBoxConfiguration(AbstractVirtualBoxProperties abstractVirtualBoxProperties,
+                                           AbstractVirtualBoxHandler abstractVirtualBoxHandler) {
+        this.abstractVirtualBoxProperties = abstractVirtualBoxProperties;
+        this.abstractVirtualBoxHandler = abstractVirtualBoxHandler;
+    }
+
+    @Override
+    public void run(ApplicationArguments args) {
+
+        String name = abstractVirtualBoxProperties.getName();
+        Integer port = abstractVirtualBoxProperties.getPort();
+
+        if (!abstractVirtualBoxProperties.getEnable()) {
+            log.info("{}服务端 配置未开启", name);
+            return;
+        }
+
+        if (port == null) {
+            log.info("{}服务端 端口未配置", name);
+            return;
+        }
+
+        try {
+            NioSocketAcceptor acceptor = new NioSocketAcceptor();
+            acceptor.setHandler(abstractVirtualBoxHandler);
+            acceptor.setReuseAddress(true);
+            acceptor.bind(new InetSocketAddress(port));
+            log.info("{}服务端已经启动,监听端口: {}", name, port);
+        } catch (Exception e) {
+            log.error("无法启动{}服务端, {}", name, e.getMessage(), e);
+        }
+    }
+
+}
@@ -3,48 +3,18 @@ package com.example.mina.config;
 import com.example.mina.box1.AeroflexVirtualBoxHandler;
 import com.example.mina.property.AeroflexVirtualBoxProperties;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.springframework.context.annotation.Configuration;
  
-import javax.annotation.PostConstruct;
-import java.net.InetSocketAddress;
-
 /**
  * @author 杜云山
  * @date 21/03/05
  */
 @Slf4j
 @Configuration(proxyBeanMethods = false)
-public class AeroflexVirtualBoxConfiguration {
-
-    private final AeroflexVirtualBoxProperties aeroflexVirtualBoxProperties;
+public class AeroflexVirtualBoxConfiguration extends AbstractVirtualBoxConfiguration {
  
     public AeroflexVirtualBoxConfiguration(AeroflexVirtualBoxProperties aeroflexVirtualBoxProperties) {
-        this.aeroflexVirtualBoxProperties = aeroflexVirtualBoxProperties;
-    }
-
-    @PostConstruct
-    public void init() {
-
-        if (!aeroflexVirtualBoxProperties.getEnable()) {
-            log.info("AeroflexVirtual服务端 配置未开启");
-            return;
-        }
-
-        if (aeroflexVirtualBoxProperties.getPort() == null) {
-            log.info("AeroflexVirtual服务端 端口未配置");
-            return;
-        }
-
-        try {
-            NioSocketAcceptor acceptor = new NioSocketAcceptor();
-            acceptor.setHandler(new AeroflexVirtualBoxHandler());
-            acceptor.setReuseAddress(true);
-            acceptor.bind(new InetSocketAddress(aeroflexVirtualBoxProperties.getPort()));
-            log.info("AeroflexVirtual服务端已经启动,监听端口: {}", aeroflexVirtualBoxProperties.getPort());
-        } catch (Exception e) {
-            log.error("无法启动AeroflexVirtual服务端, {}", e.getMessage(), e);
-        }
+        super(aeroflexVirtualBoxProperties, new AeroflexVirtualBoxHandler());
     }
  
 }
@@ -3,49 +3,18 @@ package com.example.mina.config;
 import com.example.mina.box1.Rbm3000VirtualBoxHander;
 import com.example.mina.property.Rbm3000VitualBoxProperties;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.springframework.context.annotation.Configuration;
  
-import javax.annotation.PostConstruct;
-import java.net.InetSocketAddress;
-
 /**
  * @author 杜云山
  * @date 21/03/05
  */
 @Slf4j
 @Configuration(proxyBeanMethods = false)
-public class Rbm3000VirtualBoxConfiguration {
-
-    private final Rbm3000VitualBoxProperties rbm3000VitualBoxProperties;
+public class Rbm3000VirtualBoxConfiguration extends AbstractVirtualBoxConfiguration {
  
     public Rbm3000VirtualBoxConfiguration(Rbm3000VitualBoxProperties rbm3000VitualBoxProperties) {
-        this.rbm3000VitualBoxProperties = rbm3000VitualBoxProperties;
-    }
-
-
-    @PostConstruct
-    public void init() {
-
-        if (!rbm3000VitualBoxProperties.getEnable()) {
-            log.info("Rbm3000Virtual服务端 配置未开启");
-            return;
-        }
-
-        if (rbm3000VitualBoxProperties.getPort() == null) {
-            log.info("Rbm3000Virtual服务端 端口未配置");
-            return;
-        }
-
-        try {
-            NioSocketAcceptor acceptor = new NioSocketAcceptor();
-            acceptor.setHandler(new Rbm3000VirtualBoxHander());
-            acceptor.setReuseAddress(true);
-            acceptor.bind(new InetSocketAddress(rbm3000VitualBoxProperties.getPort()));
-            log.info("Rbm3000Virtual服务端已经启动,监听端口: {}", rbm3000VitualBoxProperties.getPort());
-        } catch (Exception e) {
-            log.error("无法启动Rbm3000Virtual服务端, {}", e.getMessage(), e);
-        }
+        super(rbm3000VitualBoxProperties, new Rbm3000VirtualBoxHander());
     }
  
 }
@@ -0,0 +1,20 @@
+package com.example.mina.property;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author 杜云山
+ * @date 2021/03/05
+ */
+@Getter
+@Setter
+public abstract class AbstractVirtualBoxProperties {
+
+    protected String name = "";
+
+    protected Boolean enable = false;
+
+    protected Integer port = null;
+
+}
 \ No newline at end of file
@@ -17,10 +17,6 @@ import org.springframework.context.annotation.Configuration;
 @ConfigurationProperties(prefix = "aeroflex-virtual")
 @Configuration
 @EnableConfigurationProperties(AeroflexVirtualBoxProperties.class)
-public class AeroflexVirtualBoxProperties {
-
-    private Boolean enable = false;
-
-    private Integer port = null;
+public class AeroflexVirtualBoxProperties extends AbstractVirtualBoxProperties {
  
 }
 \ No newline at end of file
@@ -17,10 +17,6 @@ import org.springframework.context.annotation.Configuration;
 @ConfigurationProperties(prefix = "rbm3000-vitualbox-virtual")
 @Configuration
 @EnableConfigurationProperties(Rbm3000VitualBoxProperties.class)
-public class Rbm3000VitualBoxProperties {
-
-    private Boolean enable = false;
-
-    private Integer port = null;
+public class Rbm3000VitualBoxProperties extends AbstractVirtualBoxProperties {
  
 }
 \ No newline at end of file
 aeroflex-virtual:
+  name: aeroflex-virtual
   enable: true
   port: 9100
 rbm3000-vitualbox-virtual:
+  name: rbm3000-vitualbox-virtual
   enable: true
   port: 9101
...	...	@@ -0,0 +1,56 @@
	1	+package com.example.mina.config;
	2	+
	3	+import com.example.mina.base.AbstractVirtualBoxHandler;
	4	+import com.example.mina.property.AbstractVirtualBoxProperties;
	5	+import lombok.extern.slf4j.Slf4j;
	6	+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
	7	+import org.springframework.boot.ApplicationArguments;
	8	+import org.springframework.boot.ApplicationRunner;
	9	+
	10	+import java.net.InetSocketAddress;
	11	+
	12	+/**
	13	+ * @author 杜云山
	14	+ * @date 21/03/05
	15	+ */
	16	+@Slf4j
	17	+public class AbstractVirtualBoxConfiguration implements ApplicationRunner {
	18	+
	19	+ private final AbstractVirtualBoxProperties abstractVirtualBoxProperties;
	20	+
	21	+ private final AbstractVirtualBoxHandler abstractVirtualBoxHandler;
	22	+
	23	+ public AbstractVirtualBoxConfiguration(AbstractVirtualBoxProperties abstractVirtualBoxProperties,
	24	+ AbstractVirtualBoxHandler abstractVirtualBoxHandler) {
	25	+ this.abstractVirtualBoxProperties = abstractVirtualBoxProperties;
	26	+ this.abstractVirtualBoxHandler = abstractVirtualBoxHandler;
	27	+ }
	28	+
	29	+ @Override
	30	+ public void run(ApplicationArguments args) {
	31	+
	32	+ String name = abstractVirtualBoxProperties.getName();
	33	+ Integer port = abstractVirtualBoxProperties.getPort();
	34	+
	35	+ if (!abstractVirtualBoxProperties.getEnable()) {
	36	+ log.info("{}服务端配置未开启", name);
	37	+ return;
	38	+ }
	39	+
	40	+ if (port == null) {
	41	+ log.info("{}服务端端口未配置", name);
	42	+ return;
	43	+ }
	44	+
	45	+ try {
	46	+ NioSocketAcceptor acceptor = new NioSocketAcceptor();
	47	+ acceptor.setHandler(abstractVirtualBoxHandler);
	48	+ acceptor.setReuseAddress(true);
	49	+ acceptor.bind(new InetSocketAddress(port));
	50	+ log.info("{}服务端已经启动,监听端口: {}", name, port);
	51	+ } catch (Exception e) {
	52	+ log.error("无法启动{}服务端, {}", name, e.getMessage(), e);
	53	+ }
	54	+ }
	55	+
	56	+}
...	...
...	...	@@ -3,48 +3,18 @@ package com.example.mina.config;
3	3	import com.example.mina.box1.AeroflexVirtualBoxHandler;
4	4	import com.example.mina.property.AeroflexVirtualBoxProperties;
5	5	import lombok.extern.slf4j.Slf4j;
6		-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
7	6	import org.springframework.context.annotation.Configuration;
8	7
9		-import javax.annotation.PostConstruct;
10		-import java.net.InetSocketAddress;
11		-
12	8	/**
13	9	* @author 杜云山
14	10	* @date 21/03/05
15	11	*/
16	12	@Slf4j
17	13	@Configuration(proxyBeanMethods = false)
18		-public class AeroflexVirtualBoxConfiguration {
19		-
20		- private final AeroflexVirtualBoxProperties aeroflexVirtualBoxProperties;
	14	+public class AeroflexVirtualBoxConfiguration extends AbstractVirtualBoxConfiguration {
21	15
22	16	public AeroflexVirtualBoxConfiguration(AeroflexVirtualBoxProperties aeroflexVirtualBoxProperties) {
23		- this.aeroflexVirtualBoxProperties = aeroflexVirtualBoxProperties;
24		- }
25		-
26		- @PostConstruct
27		- public void init() {
28		-
29		- if (!aeroflexVirtualBoxProperties.getEnable()) {
30		- log.info("AeroflexVirtual服务端配置未开启");
31		- return;
32		- }
33		-
34		- if (aeroflexVirtualBoxProperties.getPort() == null) {
35		- log.info("AeroflexVirtual服务端端口未配置");
36		- return;
37		- }
38		-
39		- try {
40		- NioSocketAcceptor acceptor = new NioSocketAcceptor();
41		- acceptor.setHandler(new AeroflexVirtualBoxHandler());
42		- acceptor.setReuseAddress(true);
43		- acceptor.bind(new InetSocketAddress(aeroflexVirtualBoxProperties.getPort()));
44		- log.info("AeroflexVirtual服务端已经启动,监听端口: {}", aeroflexVirtualBoxProperties.getPort());
45		- } catch (Exception e) {
46		- log.error("无法启动AeroflexVirtual服务端, {}", e.getMessage(), e);
47		- }
	17	+ super(aeroflexVirtualBoxProperties, new AeroflexVirtualBoxHandler());
48	18	}
49	19
50	20	}
...	...
...	...	@@ -3,49 +3,18 @@ package com.example.mina.config;
3	3	import com.example.mina.box1.Rbm3000VirtualBoxHander;
4	4	import com.example.mina.property.Rbm3000VitualBoxProperties;
5	5	import lombok.extern.slf4j.Slf4j;
6		-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
7	6	import org.springframework.context.annotation.Configuration;
8	7
9		-import javax.annotation.PostConstruct;
10		-import java.net.InetSocketAddress;
11		-
12	8	/**
13	9	* @author 杜云山
14	10	* @date 21/03/05
15	11	*/
16	12	@Slf4j
17	13	@Configuration(proxyBeanMethods = false)
18		-public class Rbm3000VirtualBoxConfiguration {
19		-
20		- private final Rbm3000VitualBoxProperties rbm3000VitualBoxProperties;
	14	+public class Rbm3000VirtualBoxConfiguration extends AbstractVirtualBoxConfiguration {
21	15
22	16	public Rbm3000VirtualBoxConfiguration(Rbm3000VitualBoxProperties rbm3000VitualBoxProperties) {
23		- this.rbm3000VitualBoxProperties = rbm3000VitualBoxProperties;
24		- }
25		-
26		-
27		- @PostConstruct
28		- public void init() {
29		-
30		- if (!rbm3000VitualBoxProperties.getEnable()) {
31		- log.info("Rbm3000Virtual服务端配置未开启");
32		- return;
33		- }
34		-
35		- if (rbm3000VitualBoxProperties.getPort() == null) {
36		- log.info("Rbm3000Virtual服务端端口未配置");
37		- return;
38		- }
39		-
40		- try {
41		- NioSocketAcceptor acceptor = new NioSocketAcceptor();
42		- acceptor.setHandler(new Rbm3000VirtualBoxHander());
43		- acceptor.setReuseAddress(true);
44		- acceptor.bind(new InetSocketAddress(rbm3000VitualBoxProperties.getPort()));
45		- log.info("Rbm3000Virtual服务端已经启动,监听端口: {}", rbm3000VitualBoxProperties.getPort());
46		- } catch (Exception e) {
47		- log.error("无法启动Rbm3000Virtual服务端, {}", e.getMessage(), e);
48		- }
	17	+ super(rbm3000VitualBoxProperties, new Rbm3000VirtualBoxHander());
49	18	}
50	19
51	20	}
...	...
...	...	@@ -0,0 +1,20 @@
	1	+package com.example.mina.property;
	2	+
	3	+import lombok.Getter;
	4	+import lombok.Setter;
	5	+
	6	+/**
	7	+ * @author 杜云山
	8	+ * @date 2021/03/05
	9	+ */
	10	+@Getter
	11	+@Setter
	12	+public abstract class AbstractVirtualBoxProperties {
	13	+
	14	+ protected String name = "";
	15	+
	16	+ protected Boolean enable = false;
	17	+
	18	+ protected Integer port = null;
	19	+
	20	+}
0	21	\ No newline at end of file
...	...
...	...	@@ -17,10 +17,6 @@ import org.springframework.context.annotation.Configuration;
17	17	@ConfigurationProperties(prefix = "aeroflex-virtual")
18	18	@Configuration
19	19	@EnableConfigurationProperties(AeroflexVirtualBoxProperties.class)
20		-public class AeroflexVirtualBoxProperties {
21		-
22		- private Boolean enable = false;
23		-
24		- private Integer port = null;
	20	+public class AeroflexVirtualBoxProperties extends AbstractVirtualBoxProperties {
25	21
26	22	}
27	23	\ No newline at end of file
...	...
...	...	@@ -17,10 +17,6 @@ import org.springframework.context.annotation.Configuration;
17	17	@ConfigurationProperties(prefix = "rbm3000-vitualbox-virtual")
18	18	@Configuration
19	19	@EnableConfigurationProperties(Rbm3000VitualBoxProperties.class)
20		-public class Rbm3000VitualBoxProperties {
21		-
22		- private Boolean enable = false;
23		-
24		- private Integer port = null;
	20	+public class Rbm3000VitualBoxProperties extends AbstractVirtualBoxProperties {
25	21
26	22	}
27	23	\ No newline at end of file
...	...
1	1	aeroflex-virtual:
	2	+ name: aeroflex-virtual
2	3	enable: true
3	4	port: 9100
4	5	rbm3000-vitualbox-virtual:
	6	+ name: rbm3000-vitualbox-virtual
5	7	enable: true
6	8	port: 9101
...	...