refact the plugin

src/main/java/org/bench4q/master/domain/entity/plugin/MethodParamProperty.java

@@ -2,17 +2,33 @@ package org.bench4q.master.domain.entity.plugin;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+
 @Entity
 @Table(name = "methodParamProperty")
 public class MethodParamProperty {
 
+	private int id;
 	private String key;
 	private String value;
 	private MethodParam methodParam;
 
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id", nullable = false)
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
 	@Column(name = "key")
 	public String getKey() {
 		return key;
@@ -30,6 +46,7 @@ public class MethodParamProperty {
 	public void setValue(String value) {
 		this.value = value;
 	}
+
 	@ManyToOne
 	@JoinColumn(name = "methodParamId")
 	public MethodParam getMethodParam() {
@@ -40,6 +57,4 @@ public class MethodParamProperty {
 		this.methodParam = methodParam;
 	}
 
-	
-
 }

src/main/java/org/bench4q/master/domain/entity/plugin/ParamType.java

@@ -1,24 +1,21 @@
 package org.bench4q.master.domain.entity.plugin;
 
 import javax.persistence.Column;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Inheritance;
+import javax.persistence.Table;
-import javax.persistence.InheritanceType;
 
 import org.bench4q.share.models.master.plugin.ParamTypeEnum;
 
 @Entity
-@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+@Table(name = "paramType")
-@DiscriminatorColumn(name = "paramType", discriminatorType = DiscriminatorType.STRING)
 public class ParamType {
 	private int id;
+	private ParamTypeEnum type;
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -32,7 +29,13 @@ public class ParamType {
 	}
 
 	@Enumerated(EnumType.STRING)
-	ParamTypeEnum type;
+	@Column(columnDefinition = "ENUM('Field', 'MultiField', 'Table','CheckBox')")
+	public ParamTypeEnum getType() {
+		return type;
+	}
 
+	public void setType(ParamTypeEnum type) {
+		this.type = type;
+	}
 
 }

src/main/java/org/bench4q/master/domain/factory/PluginFactory.java

@@ -2,28 +2,34 @@ package org.bench4q.master.domain.factory;
 
 import java.util.HashSet;
 
-import org.bench4q.master.domain.entity.plugin.CheckBox;
-import org.bench4q.master.domain.entity.plugin.Field;
 import org.bench4q.master.domain.entity.plugin.Method;
 import org.bench4q.master.domain.entity.plugin.MethodParam;
-import org.bench4q.master.domain.entity.plugin.MultiField;
+import org.bench4q.master.domain.entity.plugin.MethodParamProperty;
 import org.bench4q.master.domain.entity.plugin.ParamType;
 import org.bench4q.master.domain.entity.plugin.Plugin;
-import org.bench4q.master.domain.entity.plugin.Table;
+import org.bench4q.master.domain.repository.PluginRepository;
-import org.bench4q.share.models.master.plugin.CheckBoxModel;
 import org.bench4q.share.models.master.plugin.MethodModel;
 import org.bench4q.share.models.master.plugin.MethodParamModel;
-import org.bench4q.share.models.master.plugin.MultiFieldModel;
+import org.bench4q.share.models.master.plugin.MethodParamPropertyModel;
-import org.bench4q.share.models.master.plugin.ParamTypeModel;
+import org.bench4q.share.models.master.plugin.ParamTypeEnum;
-import org.bench4q.share.models.master.plugin.ParamTypeString;
 import org.bench4q.share.models.master.plugin.PluginModel;
-import org.bench4q.share.models.master.plugin.FieldModel;
+import org.springframework.beans.factory.annotation.Autowired;
-import org.bench4q.share.models.master.plugin.TableModel;
+import org.springframework.stereotype.Component;
-import org.python.antlr.PythonParser.return_stmt_return;
+@Component
-
 public class PluginFactory {
 
-	public static Plugin createPluginEntity(PluginModel pluginModel) {
+	private PluginRepository pluginRepository;
+
+	public PluginRepository getPluginRepository() {
+		return pluginRepository;
+	}
+
+	@Autowired
+	public void setPluginRepository(PluginRepository pluginRepository) {
+		this.pluginRepository = pluginRepository;
+	}
+
+	public Plugin createPluginEntity(PluginModel pluginModel) {
 		Plugin plugin = new Plugin();
 		plugin.setPluginMethods(new HashSet<Method>());
 		if (pluginModel.getMethods() != null) {
@@ -38,8 +44,7 @@ public class PluginFactory {
 
 	}
 
-	private static Method createMethodEntity(MethodModel methodModel,
+	private Method createMethodEntity(MethodModel methodModel, Plugin plugin) {
-			Plugin plugin) {
 		Method method = new Method();
 		method.setMethodParams(new HashSet<MethodParam>());
 		method.setName(methodModel.getName());
@@ -55,27 +60,39 @@ public class PluginFactory {
 		return method;
 	}
 
-	private static MethodParam createMethodParamEntity(
+	private MethodParam createMethodParamEntity(
 			MethodParamModel methodParamModel, Method method) {
 		MethodParam methodParam = new MethodParam();
 		methodParam.setLable(methodParamModel.getLable());
 		methodParam.setName(methodParamModel.getName());
 		methodParam.setMethod(method);
-		methodParam.setParamType(createParamTypeEntity(
+		methodParam.setParamType(createPraParamTypeWithOutId(methodParamModel
-				methodParamModel.getParamTypeModel(), methodParam));
+				.getParamType()));
+		if (methodParamModel.getMethodParamProperties() != null) {
+			methodParam
+					.setMethodParamProperties(new HashSet<MethodParamProperty>());
+			for (MethodParamPropertyModel methodParamPropertyModel : methodParamModel
+					.getMethodParamProperties()) {
+				methodParam.getMethodParamProperties().add(
+						createMethodParamPropertyWithOutId(
+								methodParamPropertyModel, methodParam));
+			}
+		}
 		return methodParam;
 	}
 
-	private static ParamType createParamTypeEntity(
+	private ParamType createPraParamTypeWithOutId(ParamTypeEnum paramTypeEnum) {
-			ParamTypeModel paramTypeModel, MethodParam methodParam) {
+		return this.getPluginRepository().getParamTypeByType(paramTypeEnum);
-		ParamType paramType = new ParamType();
+	}
-		paramType.setFieldSeperator(paramTypeModel.getFieldSeperator());
+
-		paramType.setValueSeperator(paramTypeModel.getFieldSeperator());
+	private MethodParamProperty createMethodParamPropertyWithOutId(
-		paramType.setType(paramTypeModel.getType());
+			MethodParamPropertyModel methodParamPropertyModel,
-		paramType.setCols(paramTypeModel.getCols());
+			MethodParam methodParam) {
-		paramType.setRows(paramType.getRows());
+		MethodParamProperty methodParamProperty = new MethodParamProperty();
-		paramType.setSize(paramType.getSize());
+		methodParamProperty.setKey(methodParamPropertyModel.getKey());
-		return paramType;
+		methodParamProperty.setValue(methodParamPropertyModel.getValue());
+		methodParamProperty.setMethodParam(methodParam);
+		return methodParamProperty;
 	}
 
 	public static MethodModel extractMethodModel(Method method) {
@@ -96,68 +113,25 @@ public class PluginFactory {
 		MethodParamModel methodParamModel = new MethodParamModel();
 		methodParamModel.setLable(methodParam.getLable());
 		methodParamModel.setName(methodParam.getName());
-		methodParamModel.setParamTypeModel(extractParamTypeModel(methodParam
+		methodParamModel.setParamType(methodParam.getParamType().getType());
-				.getParamType()));
+		if (methodParam.getMethodParamProperties() != null) {
+			methodParamModel
+					.setMethodParamProperties(new HashSet<MethodParamPropertyModel>());
+			for (MethodParamProperty methodParamProperty : methodParam
+					.getMethodParamProperties()) {
+				methodParamModel.getMethodParamProperties().add(
+						extractMethodParamPropertyModel(methodParamProperty));
+			}
+		}
 		return methodParamModel;
 	}
 
-	private static ParamTypeModel extractParamTypeModel(ParamType paramType) {
+	private static MethodParamPropertyModel extractMethodParamPropertyModel(
-		ParamTypeModel paramTypeModel=new ParamTypeModel();
+			MethodParamProperty methodParamProperty) {
-		paramTypeModel.setCols(paramType.getCols());
+		MethodParamPropertyModel methodParamPropertyModel = new MethodParamPropertyModel();
-		paramTypeModel.setFieldSeperator(paramType.getFieldSeperator());
+		methodParamPropertyModel.setKey(methodParamProperty.getKey());
-		paramTypeModel.setRows(paramType.getRows());
+		methodParamPropertyModel.setValue(methodParamProperty.getValue());
-		paramTypeModel.setSize(paramType.getSize());
+		return methodParamPropertyModel;
-		paramTypeModel.setValueSeperator(paramType.getValueSeperator());
-		paramTypeModel.setType(paramType.getType());
-		return paramTypeModel;
-		
-	/*	
-		switch (paramType.getType()) {
-		case ParamTypeString.FIELD:
-			return extractFieldModel(paramType);
-		case ParamTypeString.MULTIFIELD:
-			return extractMultFieldiModel(paramType);
-		case ParamTypeString.TABLE:
-			return extractTableMode(paramType);
-		case ParamTypeString.CHECKBOX:
-			return extractCheckBoxModel(paramType);
-		default:
-			return null;
-		}*/
-	}
-
-	private static ParamTypeModel extractFieldModel(ParamType paramType) {
-		FieldModel fieldModel = new FieldModel();
-		fieldModel.setSize(paramType.getSize());
-		fieldModel.setType(paramType.getType());
-		return fieldModel;
-	}
-
-	private static ParamTypeModel extractMultFieldiModel(ParamType paramType) {
-		MultiFieldModel multiFieldModel = new MultiFieldModel();
-		multiFieldModel.setFieldSeperator(paramType.getFieldSeperator());
-		multiFieldModel.setSize(paramType.getSize());
-		multiFieldModel.setType(paramType.getType());
-		multiFieldModel.setValueSeperator(paramType.getValueSeperator());
-		return multiFieldModel;
-	}
-
-	private static TableModel extractTableMode(ParamType paramType) {
-		TableModel tableModel = new TableModel();
-		tableModel.setFieldSeperator(paramType.getFieldSeperator());
-		tableModel.setType(paramType.getType());
-		tableModel.setValueSeperator(paramType.getValueSeperator());
-		tableModel.setCols(paramType.getCols());
-		return tableModel;
-	}
-
-	private static CheckBoxModel extractCheckBoxModel(ParamType paramType) {
-		CheckBoxModel checkBoxModel = new CheckBoxModel();
-		checkBoxModel.setFieldSeperator(paramType.getFieldSeperator());
-		checkBoxModel.setType(paramType.getType());
-		checkBoxModel.setValueSeperator(paramType.getValueSeperator());
-		checkBoxModel.setRows(paramType.getRows());
-		return checkBoxModel;
 	}
 
 }

src/main/java/org/bench4q/master/domain/repository/PluginRepository.java

@@ -2,9 +2,11 @@ package org.bench4q.master.domain.repository;
 
 import java.util.List;
 
+import org.bench4q.master.domain.entity.plugin.ParamType;
 import org.bench4q.master.domain.entity.plugin.Plugin;
 import org.bench4q.master.exception.Bench4QException;
 import org.bench4q.master.exception.ExceptionUtils.EntityUniqueAlReadyExistException;
+import org.bench4q.share.models.master.plugin.ParamTypeEnum;
 import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
@@ -13,6 +15,16 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class PluginRepository extends AbstractRepositoty {
+	
+	public ParamType getParamTypeByType(ParamTypeEnum paramTypeEnum) {
+		ParamType paramType = null;
+		Session session = this.getSessionHelper().openSession();
+		paramType = (ParamType) session.createCriteria(Plugin.class)
+				.add(Restrictions.eq("type", paramTypeEnum)).uniqueResult();
+		releaseSession(session);
+		return paramType;
+	}
+
 	public boolean attatch(Plugin plugin) throws Bench4QException {
 
 		Session session = this.getSessionHelper().openSession();
@@ -98,6 +110,7 @@ public class PluginRepository extends AbstractRepositoty {
 		releaseSession(session);
 		return pluginAlreadyExist != null;
 	}
+
 	public Plugin getPlugin(String pluginName) {
 		Plugin plugin = null;
 		Session session = this.getSessionHelper().openSession();

src/main/java/org/bench4q/master/domain/service/PluginService.java

@@ -22,6 +22,7 @@ public class PluginService {
 	private Set<Plugin> plugins;
 	private List<String> pluginNameList;
 	private PluginRepository pluginRepository;
+	private PluginFactory pluginFactory;
 	private Logger logger = Logger.getLogger(PluginService.class);
 
 	public PluginRepository getPluginRepository() {
@@ -33,6 +34,15 @@ public class PluginService {
 		this.pluginRepository = pluginRepository;
 	}
 
+	public PluginFactory getPluginFactory() {
+		return pluginFactory;
+	}
+
+	@Autowired
+	public void setPluginFactory(PluginFactory pluginFactory) {
+		this.pluginFactory = pluginFactory;
+	}
+
 	private Set<Plugin> getPlugins() throws Bench4QException {
 		List<Plugin> loadPluginList = this.getPluginRepository().loadPlugins();
 		if (loadPluginList != null) {
@@ -47,7 +57,7 @@ public class PluginService {
 
 	public boolean addPlugin(PluginModel pluginModel) throws Bench4QException {
 		return this.getPluginRepository().attatch(
-				PluginFactory.createPluginEntity(pluginModel));
+				this.getPluginFactory().createPluginEntity(pluginModel));
 	}
 
 	public boolean deletePlugin(String pluginName) throws Bench4QException {

src/main/resources/org/bench4q/master/config/hibernate.cfg.xml

@@ -33,9 +33,6 @@
 		<mapping class="org.bench4q.master.domain.entity.plugin.Method" />
 		<mapping class="org.bench4q.master.domain.entity.plugin.MethodParam" />
 		<mapping class="org.bench4q.master.domain.entity.plugin.ParamType" />
-		<mapping class="org.bench4q.master.domain.entity.plugin.Field" />
+		<mapping class="org.bench4q.master.domain.entity.plugin.MethodParamProperty" />
-		<mapping class="org.bench4q.master.domain.entity.plugin.MultiField" />
-		<mapping class="org.bench4q.master.domain.entity.plugin.CheckBox" />
-		<mapping class="org.bench4q.master.domain.entity.plugin.Table" />
 	</session-factory>
 </hibernate-configuration>

src/test/java/TestHelper/Test_PlunginHelper.java

@@ -1,35 +1,35 @@
 package TestHelper;
-
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 
-import org.bench4q.share.models.master.plugin.FieldModel;
 import org.bench4q.share.models.master.plugin.MethodModel;
 import org.bench4q.share.models.master.plugin.MethodParamModel;
-import org.bench4q.share.models.master.plugin.MultiFieldModel;
+import org.bench4q.share.models.master.plugin.ParamTypeEnum;
-import org.bench4q.share.models.master.plugin.ParamTypeModel;
-import org.bench4q.share.models.master.plugin.ParamTypeString;
 import org.bench4q.share.models.master.plugin.PluginModel;
+import org.bench4q.share.models.master.plugin.MethodParamPropertyModel;
+
+;
 
 public class Test_PlunginHelper {
 
 	public static PluginModel createOnePlugin() {
 		PluginModel plugin = new PluginModel();
 		MethodModel method = new MethodModel();
-		MethodParamModel methodParamModel = new MethodParamModel();
+		MethodParamModel methodParamModelUrl = new MethodParamModel();
-		methodParamModel.setLable("input url");
+		methodParamModelUrl.setLable("input url");
-		methodParamModel.setName("url");
+		methodParamModelUrl.setName("url");
-		methodParamModel.setParamTypeModel(generateUrlParamTypeModel());
+		methodParamModelUrl.setMethodParamProperties(generatePropertyForField());
+		methodParamModelUrl.setParamType(ParamTypeEnum.Field);
 		
 		MethodParamModel methodParamsParamModel = new MethodParamModel();
 		methodParamsParamModel.setName("queryparams");
 		methodParamsParamModel.setLable("key=value");
-		methodParamsParamModel.setParamTypeModel(generateParamsParamTypeModel());
+		methodParamsParamModel.setMethodParamProperties(generatePropertyForMulti());
+		methodParamsParamModel.setParamType(ParamTypeEnum.MultiField);
 		Set<MethodParamModel> methodParams = new HashSet<MethodParamModel>();
-		methodParams.add(methodParamModel);
+		methodParams.add(methodParamModelUrl);
 		methodParams.add(methodParamsParamModel);
-
 		method.setName("get");
 		method.setMethodParams(methodParams);
 
@@ -40,20 +40,22 @@ public class Test_PlunginHelper {
 		return plugin;
 
 	}
-
+	private static Set<MethodParamPropertyModel> generatePropertyForField() {
-	private static ParamTypeModel generateUrlParamTypeModel() {
+		Set<MethodParamPropertyModel> metList = new HashSet<MethodParamPropertyModel>();
-		FieldModel paramPropertyUrl = new FieldModel();
+		MethodParamPropertyModel methodParamPropertyModel = new MethodParamPropertyModel();
-		paramPropertyUrl.setType(ParamTypeString.FIELD);
+		methodParamPropertyModel.setKey("size");
-		paramPropertyUrl.setSize(20);
+		methodParamPropertyModel.setValue("20");
-		return paramPropertyUrl;
+		metList.add(methodParamPropertyModel);
-	}
+		return metList;
-
-	private static ParamTypeModel generateParamsParamTypeModel() {
-		MultiFieldModel multiFieldModel = new MultiFieldModel();
-		multiFieldModel.setSize(20);
-		multiFieldModel.setType(ParamTypeString.MULTIFIELD);
-		return multiFieldModel;
-	}
-
 			
 		}
+	private static Set<MethodParamPropertyModel> generatePropertyForMulti() {
+		Set<MethodParamPropertyModel> metList = new HashSet<MethodParamPropertyModel>();
+		MethodParamPropertyModel methodParamPropertyModel = new MethodParamPropertyModel();
+		methodParamPropertyModel.setKey("size");
+		methodParamPropertyModel.setValue("20");
+		metList.add(methodParamPropertyModel);
+		return metList;
+
+	}
+}

src/test/java/org/bench4q/master/test/repository/Test_PluginRepository.java

@@ -22,6 +22,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 public class Test_PluginRepository {
 	private PluginRepository pluginRepository;
 	private String pluginName;
+	private PluginFactory pluginFactory;
 
 	public PluginRepository getPluginRepository() {
 		return pluginRepository;
@@ -32,6 +33,15 @@ public class Test_PluginRepository {
 		this.pluginRepository = pluginRepository;
 	}
 
+	public PluginFactory getPluginFactory() {
+		return pluginFactory;
+	}
+
+	@Autowired
+	public void setPluginFactory(PluginFactory pluginFactory) {
+		this.pluginFactory = pluginFactory;
+	}
+
 	@Before
 	public void setUp() throws Bench4QException {
 		pluginName = addPlugin();
@@ -77,7 +87,7 @@ public class Test_PluginRepository {
 	private String addPlugin() throws Bench4QException {
 		PluginModel pluginModel = TestPlunginHelper.createOnePlugin();
 		this.getPluginRepository().attatch(
-				PluginFactory.createPluginEntity(pluginModel));
+				this.getPluginFactory().createPluginEntity(pluginModel));
 		return pluginModel.getName();
 
 	}