From 845e5d3a34ca3d41158a5e02dc16e102e05b0d4b Mon Sep 17 00:00:00 2001 From: fanfuxiaoran <495538672@qq.com> Date: Wed, 19 Mar 2014 18:08:06 +0800 Subject: [PATCH] refactor the plugin --- .../models/master/plugin/CheckBoxModel.java | 21 ------ .../models/master/plugin/FieldModel.java | 19 ----- .../master/plugin/MethodParamModel.java | 39 +++++++++-- .../plugin/MethodParamPropertyModel.java | 30 ++++++++ .../models/master/plugin/MultiFieldModel.java | 17 ----- .../models/master/plugin/ParamTypeEnum.java | 6 ++ .../models/master/plugin/ParamTypeModel.java | 69 ------------------- .../models/master/plugin/ParamTypeString.java | 10 --- .../models/master/plugin/TableModel.java | 22 ------ 9 files changed, 70 insertions(+), 163 deletions(-) delete mode 100644 src/main/java/org/bench4q/share/models/master/plugin/CheckBoxModel.java delete mode 100644 src/main/java/org/bench4q/share/models/master/plugin/FieldModel.java create mode 100644 src/main/java/org/bench4q/share/models/master/plugin/MethodParamPropertyModel.java delete mode 100644 src/main/java/org/bench4q/share/models/master/plugin/MultiFieldModel.java create mode 100644 src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java delete mode 100644 src/main/java/org/bench4q/share/models/master/plugin/ParamTypeModel.java delete mode 100644 src/main/java/org/bench4q/share/models/master/plugin/ParamTypeString.java delete mode 100644 src/main/java/org/bench4q/share/models/master/plugin/TableModel.java diff --git a/src/main/java/org/bench4q/share/models/master/plugin/CheckBoxModel.java b/src/main/java/org/bench4q/share/models/master/plugin/CheckBoxModel.java deleted file mode 100644 index 3d5795a8..00000000 --- a/src/main/java/org/bench4q/share/models/master/plugin/CheckBoxModel.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.bench4q.share.models.master.plugin; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "checkBox") -public class CheckBoxModel extends ParamTypeModel { - private String rows; - @XmlElement - public String getRows() { - return rows; - } - - public void setRows(String rows) { - this.rows = rows; - } - - - - -} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/FieldModel.java b/src/main/java/org/bench4q/share/models/master/plugin/FieldModel.java deleted file mode 100644 index fbf12376..00000000 --- a/src/main/java/org/bench4q/share/models/master/plugin/FieldModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.bench4q.share.models.master.plugin; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "field") -public class FieldModel extends ParamTypeModel { - private int size; - - @XmlElement - public int getSize() { - return size; - } - - public void setSize(int size) { - this.size = size; - } - -} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/MethodParamModel.java b/src/main/java/org/bench4q/share/models/master/plugin/MethodParamModel.java index ff7448d7..b3756d7b 100644 --- a/src/main/java/org/bench4q/share/models/master/plugin/MethodParamModel.java +++ b/src/main/java/org/bench4q/share/models/master/plugin/MethodParamModel.java @@ -1,5 +1,6 @@ package org.bench4q.share.models.master.plugin; +import java.util.Set; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -8,7 +9,10 @@ import javax.xml.bind.annotation.XmlRootElement; public class MethodParamModel { private String name; private String lable; - private ParamTypeModel paramTypeModel; + private ParamTypeEnum paramType; + private String valueSeperator = ";"; + private String fieldSeperator = ","; + private Set methodParamProperties; @XmlElement public String getName() { @@ -27,14 +31,39 @@ public class MethodParamModel { public void setLable(String lable) { this.lable = lable; } +@XmlElement + public ParamTypeEnum getParamType() { + return paramType; + } + public void setParamType(ParamTypeEnum paramType) { + this.paramType = paramType; + } @XmlElement - public ParamTypeModel getParamTypeModel() { - return paramTypeModel; + public String getValueSeperator() { + return valueSeperator; } - public void setParamTypeModel(ParamTypeModel paramTypeModel) { - this.paramTypeModel = paramTypeModel; + public void setValueSeperator(String valueSeperator) { + this.valueSeperator = valueSeperator; } + @XmlElement + public String getFieldSeperator() { + return fieldSeperator; + } + + public void setFieldSeperator(String fieldSeperator) { + this.fieldSeperator = fieldSeperator; + } + @XmlElement + public Set getMethodParamProperties() { + return methodParamProperties; + } + + public void setMethodParamProperties( + Set methodParamProperties) { + this.methodParamProperties = methodParamProperties; + } + } diff --git a/src/main/java/org/bench4q/share/models/master/plugin/MethodParamPropertyModel.java b/src/main/java/org/bench4q/share/models/master/plugin/MethodParamPropertyModel.java new file mode 100644 index 00000000..f849f35b --- /dev/null +++ b/src/main/java/org/bench4q/share/models/master/plugin/MethodParamPropertyModel.java @@ -0,0 +1,30 @@ +package org.bench4q.share.models.master.plugin; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class MethodParamPropertyModel { + + private String key; + private String value; + + @XmlElement + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + @XmlElement + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/MultiFieldModel.java b/src/main/java/org/bench4q/share/models/master/plugin/MultiFieldModel.java deleted file mode 100644 index 57378b8e..00000000 --- a/src/main/java/org/bench4q/share/models/master/plugin/MultiFieldModel.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.bench4q.share.models.master.plugin; - -import javax.xml.bind.annotation.XmlElement; - -public class MultiFieldModel extends ParamTypeModel { - private int size; - - @XmlElement - public int getSize() { - return size; - } - - public void setSize(int size) { - this.size = size; - } - -} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java b/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java new file mode 100644 index 00000000..5e775171 --- /dev/null +++ b/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java @@ -0,0 +1,6 @@ +package org.bench4q.share.models.master.plugin; + +public enum ParamTypeEnum { + Field, MultiField, CheckBox, Table + +} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeModel.java b/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeModel.java deleted file mode 100644 index 55af629e..00000000 --- a/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeModel.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.bench4q.share.models.master.plugin; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class ParamTypeModel { - - private String type; - private String valueSeperator = ";"; - private String fieldSeperator = ","; - - private int size; - private String rows; - -@XmlElement - public int getSize() { - return size; - } - - public void setSize(int size) { - this.size = size; - } - -@XmlElement - public String getRows() { - return rows; - } - - public void setRows(String rows) { - this.rows = rows; - } - private String cols; -@XmlElement - public String getCols() { - return cols; - } - - public void setCols(String cols) { - this.cols = cols; - } - @XmlElement - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - @XmlElement - public String getValueSeperator() { - return valueSeperator; - } - - public void setValueSeperator(String valueSeperator) { - this.valueSeperator = valueSeperator; - } - - @XmlElement - public String getFieldSeperator() { - return fieldSeperator; - } - - public void setFieldSeperator(String fieldSeperator) { - this.fieldSeperator = fieldSeperator; - } - -} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeString.java b/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeString.java deleted file mode 100644 index 636e434b..00000000 --- a/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeString.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.bench4q.share.models.master.plugin; - -public class ParamTypeString { - - public static final String FIELD = "field"; - - public static final String MULTIFIELD = "multiField"; - public static final String CHECKBOX = "checkBox"; - public static final String TABLE = "table"; -} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/TableModel.java b/src/main/java/org/bench4q/share/models/master/plugin/TableModel.java deleted file mode 100644 index 6b0b3136..00000000 --- a/src/main/java/org/bench4q/share/models/master/plugin/TableModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.bench4q.share.models.master.plugin; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "table") -public class TableModel extends ParamTypeModel { - private String cols; - - @XmlElement - public String getCols() { - return cols; - } - - public void setCols(String cols) { - this.cols = cols; - } - - - - -}