experiment

尹本进
1 parent 23416fa6
Showing 11 changed files with 159 additions and 97 deletions Show diff stats
src/main/java/com/example/mina/client/base/AbstractClientFactory.java
src/main/java/com/example/mina/client/base/AbstractExperimentFactory.java
src/main/java/com/example/mina/client/base/ExperimentFactory.java
src/main/java/com/example/mina/client/base/ExperimentManager.java
src/main/java/com/example/mina/client/base/ExperimentOptions.java
src/main/java/com/example/mina/client/base/ExperimentType.java
src/main/java/com/example/mina/client/base/MatrixConnectConfig.java
src/main/java/com/example/mina/client/base/MatrixConstants.java
src/main/java/com/example/mina/client/base/StationPair.java
src/main/java/com/example/mina/client/experiment/HandOverExperimentFactory.java
src/main/java/com/example/mina/client/experiment/HandoverExperiment.java
@@ -16,22 +16,15 @@ public abstract class AbstractClientFactory {
     abstract public AbstractMatrixIoHandler getClientHandler();
  
     public void buildFilterChain(IoFilterChain ioFilterChain) throws Exception{
-
         ioFilterChain.addLast("codec", new ProtocolCodecFilter(new ByteProtocolFactory()));
-
     }
  
     public MatrixClient createClient(MatrixConnectConfig connectConfig){
-
-
         try{
-
             MatrixClient client = new MatrixClient(connectConfig);
-
             client.setClientHandler(getClientHandler());
             client.setMatrixDataProxy(matrixDataProxy);
             client.connect();
-
             buildFilterChain(client.getFilterChain());
             return client;
         }catch (Exception e) {
@@ -0,0 +1,34 @@
+package com.example.mina.client.base;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public abstract class AbstractExperimentFactory<T extends Experiment<MatrixClient, ExperimentOptions>> {
+
+    abstract public boolean isSupport(ExperimentOptions options);
+
+    protected abstract Class<T> getClazz();
+
+    public ExperimentProgressListner getListner() {
+        //TODO 生成任务进度更新监听器
+        return null;
+    }
+
+    public T createExperiment(MatrixClient client, ExperimentOptions options) {
+        if (isSupport(options)) {
+            log.error("the experiment is not supported by the matrix! matrix id: " + client.getDeviceId());
+            throw new RuntimeException("the experiment is not supported by the matrix! matrix id: " + client.getDeviceId());
+        }
+        try {
+            T t = getClazz().getDeclaredConstructor().newInstance();
+            t.setClient(client);
+            t.setOptions(options);
+            t.setProgressListner(getListner());
+            return t;
+        } catch (Exception e) {
+            log.error("create a experiment task is failed, matrix id: " + client.getDeviceId());
+            throw new RuntimeException("create a experiment task is failed, matrix id: " + client.getDeviceId());
+        }
+    }
+
+}
@@ -1,62 +0,0 @@
-package com.example.mina.client.base;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.CollectionUtils;
-
-import java.util.Map;
-
-@Slf4j
-public abstract class ExperimentFactory < T extends Experiment> {
-
-    private Map<String, T> experiments;
-
-    public ExperimentFactory() {
-        experiments = CollectionUtils.newHashMap(10);
-    }
-
-    public T getExperiment(String matrixId) {
-
-        return experiments.getOrDefault(matrixId, null);
-    }
-
-    public void stopExperiment(String matrixId) {
-        T t = getExperiment(matrixId);
-
-        if( t != null && t.isContinue()){
-            t.finish();
-            experiments.remove(matrixId);
-        }
-    }
-
-    abstract public boolean isSupport();
-
-    abstract Class<T> getClazz();
-
-    public ExperimentProgressListner getListner() {
-        return null;  //TODO 生成任务进度更新监听器
-    }
-
-    public T createExperiment(MatrixClient client, ExperimentOptions options){
-
-        if(isSupport()) {
-            log.error("the experiment is not supported by the matrix! matrix id: " + client.getDeviceId());
-            throw new RuntimeException("the experiment is not supported by the matrix! matrix id: " + client.getDeviceId());
-        }
-
-        Class<T> tClass = getClazz();
-
-        try{
-
-            T t = tClass.newInstance();
-
-            t.setClient(client);
-            t.setOptions(options);
-            t.setProgressListner(getListner());
-            return t;
-        }catch (Exception e) {
-            log.error("create a experiment task is failed, matrix id: " + client.getDeviceId());
-            throw new RuntimeException("create a experiment task is failed, matrix id: " + client.getDeviceId());
-        }
-    }
-
-}
@@ -0,0 +1,59 @@
+package com.example.mina.client.base;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.Assert;
+
+/**
+ * @author BenJin Yin
+ * @date 2021/4/6
+ */
+@Slf4j
+public class ExperimentManager<T extends AbstractExperimentFactory> {
+    private final ConcurrentMap<String, T> experimentFactories;
+
+    private final ConcurrentMap<String, Experiment<? extends MatrixClient,? extends ExperimentOptions>> experiments
+            = new ConcurrentHashMap<>(8);
+
+    public ExperimentManager(ConcurrentMap<String, T> experimentFactories) {
+        this.experimentFactories = experimentFactories;
+    }
+
+    public Experiment<? extends MatrixClient,? extends ExperimentOptions> getExperiment(String experimentId) {
+        return experiments.getOrDefault(experimentId, null);
+    }
+
+    public void stopExperiment(String experimentId) {
+        Experiment<? extends MatrixClient,? extends ExperimentOptions> t = getExperiment(experimentId);
+        if (t != null && t.isContinue()) {
+            t.finish();
+            experiments.remove(experimentId);
+        }
+    }
+
+    public T getClientFactory(String name) {
+        return this.experimentFactories.get(name);
+    }
+
+    public Experiment<? extends MatrixClient,? extends ExperimentOptions> getOrCreateExperiment(MatrixClient client, ExperimentOptions options) {
+        Assert.notNull(client, "matrix connect config is null");
+        Assert.hasLength(client.getDeviceId(), "deviceId can not be empty");
+
+        String deviceId = client.getDeviceId();
+        Experiment<? extends MatrixClient,? extends ExperimentOptions> experiment = experiments.get(options.getExperimentId());
+        if (experiment != null) {
+            return experiment;
+        }
+        if (!experimentFactories.containsKey(deviceId)) {
+            log.error("the matrix type is not supported by the system! matrix type is: " + deviceId);
+            throw new RuntimeException("the matrix type is not supported by the system! matrix type is: " + deviceId);
+
+        }
+        T t = experimentFactories.get(deviceId);
+        experiment = t.createExperiment(client, options);
+        experiments.put(options.experimentId, experiment);
+        return experiment;
+    }
+
+}
 package com.example.mina.client.base;
  
 import java.time.ZonedDateTime;
-import java.util.List;
 import lombok.Data;
  
 @Data
@@ -17,28 +16,18 @@ public abstract class ExperimentOptions {
  
     protected Integer step;
  
-    /**
-     * 每次发送指令的 时间间隔
-     */
     protected Integer period;
  
-    /**
-     * 单次从 start --> end 一个周期后的 暂停时间
-     */
     protected Integer pause;
  
-    /**
-     * 最大循环次数
-     */
     protected Integer iterations;
  
     protected ZonedDateTime finishAt;
  
-
-    protected boolean checkOptions(){
-        if(startAttn<0 || endAttn<0 || startAttn>endAttn || step<=0
-            || pause<0 || period<=0 || iterations<=0 || finishAt==null ||
-            finishAt.isBefore(ZonedDateTime.now())) {
+    protected boolean checkOptions() {
+        if (startAttn < 0 || endAttn < 0 || startAttn > endAttn || step <= 0
+                || pause < 0 || period <= 0 || iterations <= 0 || finishAt == null ||
+                finishAt.isBefore(ZonedDateTime.now())) {
             return false;
         }
         return true;
@@ -0,0 +1,28 @@
+package com.example.mina.client.base;
+
+/**
+ * @author BenJin Yin
+ * @date 2021/4/6
+ */
+public enum ExperimentType {
+    HAND_OVER("handOver");
+
+    private final String remark;
+
+    ExperimentType(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public static ExperimentType getInstanceByRemark(String remark) {
+        for (ExperimentType obj : values()) {
+            if (obj.getRemark().equals(remark)) {
+                return obj;
+            }
+        }
+        return null;
+    }
+}
@@ -20,11 +20,5 @@ public class MatrixConnectConfig {
  
     private Integer port;
  
-//    private Integer rows;
-
-//    private Integer cols;
-
-//    private Integer maxAttenuation;
-
     private Map<String, Object> options;
 }
 package com.example.mina.client.base;
  
-public class MatrixConstants {
+public final class MatrixConstants {
  
     public static final String SESSION_CONFIG_NAME = "SESSION_CONFIG";
  
@@ -6,7 +6,6 @@ import lombok.Builder;
 import lombok.Data;
  
 /**
- * 输入输出端口
  * @author BenJin Yin
  * @date 2021/4/2
  */
@@ -14,11 +13,11 @@ import lombok.Data;
 @Builder
 public class StationPair {
     /**
-     * 输出端口
+     * out port
      */
     private Integer out;
     /**
-     * 输入端口
+     * in port
      */
     private List<Integer> inList;
 }
@@ -0,0 +1,25 @@
+package com.example.mina.client.experiment;
+
+import com.example.mina.client.base.AbstractExperimentFactory;
+import com.example.mina.client.base.Experiment;
+import com.example.mina.client.base.ExperimentOptions;
+import com.example.mina.client.base.ExperimentType;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author BenJin Yin
+ * @date 2021/4/6
+ */
+@Component
+public class HandOverExperimentFactory extends AbstractExperimentFactory {
+    @Override
+    public boolean isSupport(ExperimentOptions options) {
+        ExperimentType instance = ExperimentType.getInstanceByRemark(options.getExperimentType());
+        return instance == ExperimentType.HAND_OVER;
+    }
+
+    @Override
+    public Class<? extends Experiment> getClazz() {
+        return HandoverExperiment.class;
+    }
+}
 package com.example.mina.client.experiment;
  
-import com.example.mina.client.base.*;
-import org.springframework.util.CollectionUtils;
-
+import com.example.mina.client.base.Experiment;
+import com.example.mina.client.base.MatrixClient;
+import com.example.mina.client.base.MatrixCommand;
+import com.example.mina.client.base.MatrixConstants;
+import com.example.mina.client.base.StationPair;
 import java.util.ArrayList;
 import java.util.List;
+import org.springframework.util.CollectionUtils;
  
 public class HandoverExperiment extends Experiment<MatrixClient, HandOverExperimentOptions> {
...	...	@@ -16,22 +16,15 @@ public abstract class AbstractClientFactory {
16	16	abstract public AbstractMatrixIoHandler getClientHandler();
17	17
18	18	public void buildFilterChain(IoFilterChain ioFilterChain) throws Exception{
19		-
20	19	ioFilterChain.addLast("codec", new ProtocolCodecFilter(new ByteProtocolFactory()));
21		-
22	20	}
23	21
24	22	public MatrixClient createClient(MatrixConnectConfig connectConfig){
25		-
26		-
27	23	try{
28		-
29	24	MatrixClient client = new MatrixClient(connectConfig);
30		-
31	25	client.setClientHandler(getClientHandler());
32	26	client.setMatrixDataProxy(matrixDataProxy);
33	27	client.connect();
34		-
35	28	buildFilterChain(client.getFilterChain());
36	29	return client;
37	30	}catch (Exception e) {
...	...
...	...	@@ -0,0 +1,34 @@
	1	+package com.example.mina.client.base;
	2	+
	3	+import lombok.extern.slf4j.Slf4j;
	4	+
	5	+@Slf4j
	6	+public abstract class AbstractExperimentFactory<T extends Experiment<MatrixClient, ExperimentOptions>> {
	7	+
	8	+ abstract public boolean isSupport(ExperimentOptions options);
	9	+
	10	+ protected abstract Class<T> getClazz();
	11	+
	12	+ public ExperimentProgressListner getListner() {
	13	+ //TODO 生成任务进度更新监听器
	14	+ return null;
	15	+ }
	16	+
	17	+ public T createExperiment(MatrixClient client, ExperimentOptions options) {
	18	+ if (isSupport(options)) {
	19	+ log.error("the experiment is not supported by the matrix! matrix id: " + client.getDeviceId());
	20	+ throw new RuntimeException("the experiment is not supported by the matrix! matrix id: " + client.getDeviceId());
	21	+ }
	22	+ try {
	23	+ T t = getClazz().getDeclaredConstructor().newInstance();
	24	+ t.setClient(client);
	25	+ t.setOptions(options);
	26	+ t.setProgressListner(getListner());
	27	+ return t;
	28	+ } catch (Exception e) {
	29	+ log.error("create a experiment task is failed, matrix id: " + client.getDeviceId());
	30	+ throw new RuntimeException("create a experiment task is failed, matrix id: " + client.getDeviceId());
	31	+ }
	32	+ }
	33	+
	34	+}
...	...
...	...	@@ -1,62 +0,0 @@
1		-package com.example.mina.client.base;
2		-
3		-import lombok.extern.slf4j.Slf4j;
4		-import org.springframework.util.CollectionUtils;
5		-
6		-import java.util.Map;
7		-
8		-@Slf4j
9		-public abstract class ExperimentFactory < T extends Experiment> {
10		-
11		- private Map<String, T> experiments;
12		-
13		- public ExperimentFactory() {
14		- experiments = CollectionUtils.newHashMap(10);
15		- }
16		-
17		- public T getExperiment(String matrixId) {
18		-
19		- return experiments.getOrDefault(matrixId, null);
20		- }
21		-
22		- public void stopExperiment(String matrixId) {
23		- T t = getExperiment(matrixId);
24		-
25		- if( t != null && t.isContinue()){
26		- t.finish();
27		- experiments.remove(matrixId);
28		- }
29		- }
30		-
31		- abstract public boolean isSupport();
32		-
33		- abstract Class<T> getClazz();
34		-
35		- public ExperimentProgressListner getListner() {
36		- return null; //TODO 生成任务进度更新监听器
37		- }
38		-
39		- public T createExperiment(MatrixClient client, ExperimentOptions options){
40		-
41		- if(isSupport()) {
42		- log.error("the experiment is not supported by the matrix! matrix id: " + client.getDeviceId());
43		- throw new RuntimeException("the experiment is not supported by the matrix! matrix id: " + client.getDeviceId());
44		- }
45		-
46		- Class<T> tClass = getClazz();
47		-
48		- try{
49		-
50		- T t = tClass.newInstance();
51		-
52		- t.setClient(client);
53		- t.setOptions(options);
54		- t.setProgressListner(getListner());
55		- return t;
56		- }catch (Exception e) {
57		- log.error("create a experiment task is failed, matrix id: " + client.getDeviceId());
58		- throw new RuntimeException("create a experiment task is failed, matrix id: " + client.getDeviceId());
59		- }
60		- }
61		-
62		-}
...	...	@@ -0,0 +1,59 @@
	1	+package com.example.mina.client.base;
	2	+
	3	+import java.util.concurrent.ConcurrentHashMap;
	4	+import java.util.concurrent.ConcurrentMap;
	5	+import lombok.extern.slf4j.Slf4j;
	6	+import org.springframework.util.Assert;
	7	+
	8	+/**
	9	+ * @author BenJin Yin
	10	+ * @date 2021/4/6
	11	+ */
	12	+@Slf4j
	13	+public class ExperimentManager<T extends AbstractExperimentFactory> {
	14	+ private final ConcurrentMap<String, T> experimentFactories;
	15	+
	16	+ private final ConcurrentMap<String, Experiment<? extends MatrixClient,? extends ExperimentOptions>> experiments
	17	+ = new ConcurrentHashMap<>(8);
	18	+
	19	+ public ExperimentManager(ConcurrentMap<String, T> experimentFactories) {
	20	+ this.experimentFactories = experimentFactories;
	21	+ }
	22	+
	23	+ public Experiment<? extends MatrixClient,? extends ExperimentOptions> getExperiment(String experimentId) {
	24	+ return experiments.getOrDefault(experimentId, null);
	25	+ }
	26	+
	27	+ public void stopExperiment(String experimentId) {
	28	+ Experiment<? extends MatrixClient,? extends ExperimentOptions> t = getExperiment(experimentId);
	29	+ if (t != null && t.isContinue()) {
	30	+ t.finish();
	31	+ experiments.remove(experimentId);
	32	+ }
	33	+ }
	34	+
	35	+ public T getClientFactory(String name) {
	36	+ return this.experimentFactories.get(name);
	37	+ }
	38	+
	39	+ public Experiment<? extends MatrixClient,? extends ExperimentOptions> getOrCreateExperiment(MatrixClient client, ExperimentOptions options) {
	40	+ Assert.notNull(client, "matrix connect config is null");
	41	+ Assert.hasLength(client.getDeviceId(), "deviceId can not be empty");
	42	+
	43	+ String deviceId = client.getDeviceId();
	44	+ Experiment<? extends MatrixClient,? extends ExperimentOptions> experiment = experiments.get(options.getExperimentId());
	45	+ if (experiment != null) {
	46	+ return experiment;
	47	+ }
	48	+ if (!experimentFactories.containsKey(deviceId)) {
	49	+ log.error("the matrix type is not supported by the system! matrix type is: " + deviceId);
	50	+ throw new RuntimeException("the matrix type is not supported by the system! matrix type is: " + deviceId);
	51	+
	52	+ }
	53	+ T t = experimentFactories.get(deviceId);
	54	+ experiment = t.createExperiment(client, options);
	55	+ experiments.put(options.experimentId, experiment);
	56	+ return experiment;
	57	+ }
	58	+
	59	+}
...	...
1	1	package com.example.mina.client.base;
2	2
3	3	import java.time.ZonedDateTime;
4		-import java.util.List;
5	4	import lombok.Data;
6	5
7	6	@Data
...	...	@@ -17,28 +16,18 @@ public abstract class ExperimentOptions {
17	16
18	17	protected Integer step;
19	18
20		- /**
21		- * 每次发送指令的时间间隔
22		- */
23	19	protected Integer period;
24	20
25		- /**
26		- * 单次从 start --> end 一个周期后的暂停时间
27		- */
28	21	protected Integer pause;
29	22
30		- /**
31		- * 最大循环次数
32		- */
33	23	protected Integer iterations;
34	24
35	25	protected ZonedDateTime finishAt;
36	26
37		-
38		- protected boolean checkOptions(){
39		- if(startAttn<0 \|\| endAttn<0 \|\| startAttn>endAttn \|\| step<=0
40		- \|\| pause<0 \|\| period<=0 \|\| iterations<=0 \|\| finishAt==null \|\|
41		- finishAt.isBefore(ZonedDateTime.now())) {
	27	+ protected boolean checkOptions() {
	28	+ if (startAttn < 0 \|\| endAttn < 0 \|\| startAttn > endAttn \|\| step <= 0
	29	+ \|\| pause < 0 \|\| period <= 0 \|\| iterations <= 0 \|\| finishAt == null \|\|
	30	+ finishAt.isBefore(ZonedDateTime.now())) {
42	31	return false;
43	32	}
44	33	return true;
...	...
...	...	@@ -0,0 +1,28 @@
	1	+package com.example.mina.client.base;
	2	+
	3	+/**
	4	+ * @author BenJin Yin
	5	+ * @date 2021/4/6
	6	+ */
	7	+public enum ExperimentType {
	8	+ HAND_OVER("handOver");
	9	+
	10	+ private final String remark;
	11	+
	12	+ ExperimentType(String remark) {
	13	+ this.remark = remark;
	14	+ }
	15	+
	16	+ public String getRemark() {
	17	+ return remark;
	18	+ }
	19	+
	20	+ public static ExperimentType getInstanceByRemark(String remark) {
	21	+ for (ExperimentType obj : values()) {
	22	+ if (obj.getRemark().equals(remark)) {
	23	+ return obj;
	24	+ }
	25	+ }
	26	+ return null;
	27	+ }
	28	+}
...	...
...	...	@@ -20,11 +20,5 @@ public class MatrixConnectConfig {
20	20
21	21	private Integer port;
22	22
23		-// private Integer rows;
24		-
25		-// private Integer cols;
26		-
27		-// private Integer maxAttenuation;
28		-
29	23	private Map<String, Object> options;
30	24	}
...	...
1	1	package com.example.mina.client.base;
2	2
3		-public class MatrixConstants {
	3	+public final class MatrixConstants {
4	4
5	5	public static final String SESSION_CONFIG_NAME = "SESSION_CONFIG";
6	6
...	...
...	...	@@ -6,7 +6,6 @@ import lombok.Builder;
6	6	import lombok.Data;
7	7
8	8	/**
9		- * 输入输出端口
10	9	* @author BenJin Yin
11	10	* @date 2021/4/2
12	11	*/
...	...	@@ -14,11 +13,11 @@ import lombok.Data;
14	13	@Builder
15	14	public class StationPair {
16	15	/**
17		- * 输出端口
	16	+ * out port
18	17	*/
19	18	private Integer out;
20	19	/**
21		- * 输入端口
	20	+ * in port
22	21	*/
23	22	private List<Integer> inList;
24	23	}
...	...
...	...	@@ -0,0 +1,25 @@
	1	+package com.example.mina.client.experiment;
	2	+
	3	+import com.example.mina.client.base.AbstractExperimentFactory;
	4	+import com.example.mina.client.base.Experiment;
	5	+import com.example.mina.client.base.ExperimentOptions;
	6	+import com.example.mina.client.base.ExperimentType;
	7	+import org.springframework.stereotype.Component;
	8	+
	9	+/**
	10	+ * @author BenJin Yin
	11	+ * @date 2021/4/6
	12	+ */
	13	+@Component
	14	+public class HandOverExperimentFactory extends AbstractExperimentFactory {
	15	+ @Override
	16	+ public boolean isSupport(ExperimentOptions options) {
	17	+ ExperimentType instance = ExperimentType.getInstanceByRemark(options.getExperimentType());
	18	+ return instance == ExperimentType.HAND_OVER;
	19	+ }
	20	+
	21	+ @Override
	22	+ public Class<? extends Experiment> getClazz() {
	23	+ return HandoverExperiment.class;
	24	+ }
	25	+}
...	...