Skip to content

F
Flowable Engine

开发团队 / Flowable Engine

通知 9
Star 0
Fork 0
F
Flowable Engine

体验新版 GitCode，发现更多精彩内容 >>

提交 e15216e3 编写于 作者: M meyerd
浏览文件
操作

Fixed bug in CycleDaoMybatisImpl and trying to bring cycle-db test back up.

上级 deb42602
隐藏空白更改
内联 并排
Showing with 53 addition and 309 deletion
modules/activiti-cycle/pom.xml
浏览文件 @ e15216e3
......@@ -35,13 +35,10 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/RepositoryConnectorConfigurationManagerImplTest.java</exclude>
<exclude>**/TestSvnRepositoryConnector.java</exclude>
<exclude>**/SftpConnectorTest.java</exclude>
<excludes>
<exclude>**/AdjustShapeNamesForXmlNCNameTest.java</exclude>
<exclude>**/FileSystemConnectorTest.java</exclude>
<exclude>**/CycleDaoMyBatisImplTest.java</exclude>
<!-- <exclude>**/CycleDaoMyBatisImplTest.java</exclude> -->
</excludes>
</configuration>
</plugin>
......
modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/db/CycleConfigurationDao.java
浏览文件 @ e15216e3
......@@ -17,8 +17,10 @@ public interface CycleConfigurationDao {
public List<CycleConfigEntity> selectCycleConfigByGroup(String group);
public List<CycleConfigEntity> selectCycleConfigById(String id);
public CycleConfigEntity selectCycleConfigById(String id);
public List<String> selectCycleConfigurationGroups();
public void deleteCycleConfigurationEntry(String id);
}
modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/db/impl/CycleDaoMyBatisImpl.java
浏览文件 @ e15216e3
......@@ -327,11 +327,10 @@ public class CycleDaoMyBatisImpl extends AbstractCycleDaoMyBatisImpl implements
}
}
@SuppressWarnings("unchecked")
public List<CycleConfigEntity> selectCycleConfigById(String id) {
public CycleConfigEntity selectCycleConfigById(String id) {
SqlSession session = openSession();
try {
return (List<CycleConfigEntity>) session.selectList("selectCycleConfigById", id);
return (CycleConfigEntity) session.selectOne("selectCycleConfigById", id);
} finally {
session.close();
}
......@@ -363,7 +362,22 @@ public class CycleDaoMyBatisImpl extends AbstractCycleDaoMyBatisImpl implements
public List<String> selectCycleConfigurationGroups() {
SqlSession session = openSession();
try {
return (List<String>) session.selectList("selectCycleConfigGroups");
List<CycleConfigEntity> entities = (List<CycleConfigEntity>) session.selectList("selectCycleConfigGroups");
List<String> result = new ArrayList<String>();
for (CycleConfigEntity entity : entities) {
result.add(entity.getGroupName());
}
return result;
} finally {
session.close();
}
}
public void deleteCycleConfigurationEntry(String id) {
SqlSession session = openSession();
try {
session.delete("deleteConfigById", id);
session.commit();
} finally {
session.close();
}
......
modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/ibatis/cycleConfig.mapping.xml
浏览文件 @ e15216e3
......@@ -14,7 +14,7 @@
</resultMap>
<select id="selectCycleConfigGroups" resultType="java.util.List">
<select id="selectCycleConfigGroups" resultMap="resultMapCycleConfig">
select distinct GROUP_ from ACT_CY_CONFIG
</select>
......
modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/conf/RepositoryConnectorConfigurationManagerImplTest.java 已删除 100644 → 0
浏览文件 @ deb42602
package org.activiti.cycle.impl.conf;
import org.activiti.cycle.impl.ActivitiCycleTest;
import org.activiti.engine.ProcessEngines;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class RepositoryConnectorConfigurationManagerImplTest extends ActivitiCycleTest{
// @BeforeClass
// public static void setUp() throws Exception {
// // ProcessEngines.destroy();
// ProcessEngines.init();
// // configurationService = new CycleServiceImpl();
// }
// @AfterClass
// public static void tearDown() throws Exception {
// // configurationService = null;
// // ProcessEngines.destroy();
// }
// @Test
// public void testAPI() {
// try {
// ConfigurationContainer enterpriseConfiguration = new
// ConfigurationContainer("camunda");
// // This one is for all, so don't save a password, the GUI should query it!
// RepositoryConnectorConfiguration conf1 = new
// SignavioConnectorConfiguration("Activiti Modeler",
// "http://localhost:8080/activiti-modeler/");
// enterpriseConfiguration.addRepositoryConnectorConfiguration(conf1);
//
// ConfigurationContainer userConfiguration = new
// ConfigurationContainer("bernd");
// userConfiguration.addParent(enterpriseConfiguration);
// RepositoryConnectorConfiguration conf2 = new
// FileSystemConnectorConfiguration("Hard Drive", new File("c:"));
// userConfiguration.addRepositoryConnectorConfiguration(conf2);
// // This one ist just for me, I save the password
// RepositoryConnectorConfiguration conf3 = new
// SignavioConnectorConfiguration("Signavio SAAS",
// "http://editor.signavio.com/", null,
// "bernd.ruecker@camunda.com", "xxx");
// userConfiguration.addRepositoryConnectorConfiguration(conf3);
//
// // now we have a config for the user containing 2 repository configs
//
// configurationService.saveConfiguration(enterpriseConfiguration);
// configurationService.saveConfiguration(userConfiguration);
//
// ConfigurationContainer loadedConf =
// configurationService.getConfiguration("bernd");
//
// // ConfigurationContainer configuration =
// // configurationService.getConfiguration("bernd");
// List<RepositoryConnectorConfiguration> connectors =
// loadedConf.getConnectorConfigurations();
// assertEquals(3, connectors.size());
// assertEquals("Hard Drive", connectors.get(0).getName());
// assertEquals("Signavio SAAS", connectors.get(1).getName());
// assertEquals("Activiti Modeler", connectors.get(2).getName());
//
// RepositoryConnector connector = new
// RootConnectorConfiguration(loadedConf).createConnector();
//
// // check that files were created
// // assertTrue(new File("bernd.cycle-conf.xml").delete());
// // assertTrue(new File("camunda.cycle-conf.xml").delete());
// } finally {
// // clean up to delete created configs, do it in the finally again to make
// // sure they are deleted
// // new File("bernd.cycle-conf.xml").delete();
// // new File("camunda.cycle-conf.xml").delete();
// }
// }
@Test
public void testLinks() {
// configurationService.addArtifactLink("FS/text/test.txt",
// "SIG/bpmn/test.bpmn20.xml");
// List<RepositoryArtifactLink> artifactResultList =
// configurationService.getArtifactLinks("FS/text/test.txt");
// cycleLinkTarget.setDescription("nur ein Testlink");
// cycleLinkTarget.setLinkType(Artifact.TYPE_UNSPECIFIED);
// cycleLinkTarget.setTargetArtifactId("SIG/bpmn/test.bpmn20.xml");
// cycleLinkTargetList.add(cycleLinkTarget);
//
// cycleLink.setSourceArtifactId("FS/text/test.txt");
//
// // cycleLink.setCycleLinkTarget(cycleLinkTargetList);
//
// configurationService.addArtifactLink("FS/text/test.txt",
// "SIG/bpmn/test.bpmn20.xml");
//
// List<Artifact> artifactLinks =
// configurationService.getArtifactLinks("FS/text/test.txt");
// if (artifactLinks != null && !artifactLinks.isEmpty()) {
// Artifact cyleLink = artifactLinks.get(0);
// System.out.println(cycleLink.getSourceArtifactId());
// System.out.println(cycleLink.getCycleLinkTarget().size());
// }
}
// Commented because method getProcessEngineConfiguration is not in the
// interface
// @Test
// public void testGetProcessEngineConfiguration() {
// ProcessEngineConfiguration processEngineConfiguration =
// configurationService.getProcessEngineConfiguration();
// if (processEngineConfiguration == null) {
// fail("config is null");
// }
// }
// @Test
// public void testInsertCycleConfiguration() {
// String id = "kristin";
// String configXML = "<org.activiti.cycle.impl.conf.ConfigurationContainer>"
// + " <name>kristin</name>"
// + " <linkedConnectors>"
// +
// "<org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>"
// + "<name>Activiti Modeler</name>"
// + "<credentialsSaved>false</credentialsSaved>"
// +
// "<signavioBaseUrl>http://localhost:8080/activiti-modeler/</signavioBaseUrl>"
// + "<loginRequired>false</loginRequired>"
// +
// "</org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>"
// + "<org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>"
// + "<name>Eclipse Workspace (File System)</name>"
// +
// "<baseFilePath>C:/Dokumente+und+Einstellungen/polenz/workspace/activiti/distro/target/activiti-5.3-SNAPSHOT/apps/eclipse-workspace</baseFilePath>"
// +
// "</org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>"
// + "<org.activiti.cycle.impl.connector.signavio.OryxConnectorConfiguration>"
// + "<name>oryx-project.org</name>"
// + "<credentialsSaved>false</credentialsSaved>"
// + "<signavioBaseUrl>http://oryx-project.org/</signavioBaseUrl>"
// + "<loginRequired>false</loginRequired>"
// +
// "</org.activiti.cycle.impl.connector.signavio.OryxConnectorConfiguration>"
// + "</linkedConnectors>"
// + "<parentContainers/>"
// + "</org.activiti.cycle.impl.conf.ConfigurationContainer>";
// configurationService.createAndInsert(configXML, id);
//
// }
//
// @Test
// public void testSelectById() {
// CycleConfigEntity cycleConfig = configurationService.selectById("kristin");
//
// String configXML = "<org.activiti.cycle.impl.conf.ConfigurationContainer>"
// + " <name>kristinPolenz</name>"
// + " <linkedConnectors>"
// +
// "<org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>"
// + "<name>Activiti Modeler</name>"
// + "<credentialsSaved>false</credentialsSaved>"
// +
// "<signavioBaseUrl>http://localhost:8080/activiti-modeler/</signavioBaseUrl>"
// + "<loginRequired>false</loginRequired>"
// +
// "</org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration>"
// + "<org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>"
// + "<name>Eclipse Workspace (File System)</name>"
// +
// "<baseFilePath>C:/Dokumente+und+Einstellungen/polenz/workspace/activiti/distro/target/activiti-5.3-SNAPSHOT/apps/eclipse-workspace</baseFilePath>"
// +
// "</org.activiti.cycle.impl.connector.fs.FileSystemConnectorConfiguration>"
// + "<org.activiti.cycle.impl.connector.signavio.OryxConnectorConfiguration>"
// + "<name>oryx-project.org</name>"
// + "<credentialsSaved>false</credentialsSaved>"
// + "<signavioBaseUrl>http://oryx-project.org/</signavioBaseUrl>"
// + "<loginRequired>false</loginRequired>"
// +
// "</org.activiti.cycle.impl.connector.signavio.OryxConnectorConfiguration>"
// + "</linkedConnectors>"
// + "<parentContainers/>"
// + "</org.activiti.cycle.impl.conf.ConfigurationContainer>";
//
// //update by id
// cycleConfig.setConfigXML(configXML);
// cycleConfig.setRevision(cycleConfig.getRevision()+1);
//
// configurationService.updateById(cycleConfig);
// }
//
// @Test
// public void testDeleteById() {
// configurationService.deleteById("kristin");
// }
//
//
// @Test
// public void testPersistRepositoryConfiguration() {
// SignavioConnectorConfiguration sigConf = new
// SignavioConnectorConfiguration();
// repoConfManager.persistRepositoryConfiguration(sigConf);
//
// DemoConnectorConfiguration demoConf = new DemoConnectorConfiguration();
// repoConfManager.persistRepositoryConfiguration(demoConf);
//
// FileSystemConnectorConfiguration fileConf = new
// FileSystemConnectorConfiguration();
// repoConfManager.persistRepositoryConfiguration(fileConf);
// }
//
// @Test
// public void testCreateRepositoryConfiguration() {
// // repoConfManager.registerRepositoryConnector(DemoConnector.class);
// // repoConfManager.registerRepositoryConnector(SignavioConnector.class);
// // repoConfManager.registerRepositoryConnector(FileSystemConnector.class);
//
// RepositoryConnectorConfiguration config = new
// SignavioConnectorConfiguration("Local Signavio", "http://localhost:8080",
// null, "christian.lipphardt", "xxx");
// System.out.println(config);
//
// repoConfManager.persistRepositoryConfiguration(config);
// }
//
// @Test
// public void testRepoConfigUsage() {
// // register connectors
// // repoConfManager.registerRepositoryConnector(DemoConnector.class);
// // repoConfManager.registerRepositoryConnector(SignavioConnector.class);
// // repoConfManager.registerRepositoryConnector(FileSystemConnector.class);
//
// // create configurations
// repoConfManager.persistRepositoryConfiguration(new
// SignavioConnectorConfiguration("Activiti Modeler",
// "http://localhost:8080/activiti-modeler/", null,
// "christian.lipphardt", "xxx"));
// repoConfManager.persistRepositoryConfiguration(new
// FileSystemConnectorConfiguration("Hard Drive", new File("c:")));
//
// // // create connector instances based on configs
// // List<RepositoryConnector> connectors =
// // repoConfManager.createRepositoryConnectorsFromConfigurations();
// //
// // // use connectors
// // for (RepositoryConnector repositoryConnector : connectors) {
// // List<RepositoryNode> nodes = repositoryConnector.getChildNodes("");
// // System.out.println(repositoryConnector.getClass().getName() + ": " +
// // nodes);
// // }
// }
//
// @Test
// public void testLoadRepoConfig() {
// // register connectors
// // config for demo connector does not exists, what to do?
// // repoConfManager.registerRepositoryConnector(DemoConnector.class);
// CycleConfigurationService repoConfManager1 = new
// SimpleXstreamRepositoryConnectorConfigurationManager();
// // repoConfManager1.registerRepositoryConnector(SignavioConnector.class);
// // repoConfManager1.registerRepositoryConnector(FileSystemConnector.class);
//
// // get configs from filesystem
// List< ? extends RepositoryConnectorConfiguration> configs =
// repoConfManager1.findAllRepositoryConfigurations();
// for (RepositoryConnectorConfiguration config : configs) {
// System.out.println(config);
// RepositoryConnector connector = config.createConnector();
// List<RepositoryNode> nodes = connector.getChildNodes("");
// System.out.println(connector.getClass().getName() + ": " + nodes);
// }
// }
}
modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/db/impl/CycleDaoMyBatisImplTest.java
浏览文件 @ e15216e3
......@@ -176,29 +176,35 @@ public class CycleDaoMyBatisImplTest extends ActivitiCycleDbAwareTest {
}
public void testSelectCycleConfigGroups() {
// CycleConfigEntity ce1 = new CycleConfigEntity();
// ce1.setGroupName("g1");
// ce1.setKey("key1");
// ce1.setValue("value1");
//
// CycleConfigEntity ce2 = new CycleConfigEntity();
// ce2.setGroupName("g2");
// ce2.setKey("key2");
// ce2.setValue("value2");
//
// CycleConfigEntity ce3 = new CycleConfigEntity();
// ce3.setGroupName("g1"); // g1
// ce3.setKey("key3");
// ce3.setValue("value3");
//
// dao.saveCycleConfig(ce1);
// dao.saveCycleConfig(ce2);
// dao.saveCycleConfig(ce3);
//
// List<String> groups = dao.selectCycleConfigurationGroups();
//
// assertEquals(2, groups.size());
//
CycleConfigEntity ce1 = new CycleConfigEntity();
ce1.setGroupName("g1");
ce1.setKey("key1");
ce1.setValue("value1");
CycleConfigEntity ce2 = new CycleConfigEntity();
ce2.setGroupName("g2");
ce2.setKey("key2");
ce2.setValue("value2");
CycleConfigEntity ce3 = new CycleConfigEntity();
ce3.setGroupName("g1"); // g1
ce3.setKey("key3");
ce3.setValue("value3");
dao.saveCycleConfig(ce1);
dao.saveCycleConfig(ce2);
dao.saveCycleConfig(ce3);
List<String> groups = dao.selectCycleConfigurationGroups();
assertEquals(2, groups.size());
for (String group : groups) {
for (CycleConfigEntity entity : dao.selectCycleConfigByGroup(group)) {
dao.deleteCycleConfigurationEntry(entity.getId());
}
}
}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或