dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removeById fixed

Browse Source
This commit is contained in:
mp-loki 2017-05-14 20:16:01 -04:00
parent e80cb31a15
commit ed6de776e4
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
View File

@ -66,6 +66,7 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D> implements Dao<
} }
@Override @Override
@Transactional(propagation = REQUIRES_NEW)
public D findById(UUID key) { public D findById(UUID key) {
log.debug("Get entity by key {}", key); log.debug("Get entity by key {}", key);
E entity = getCrudRepository().findOne(key); E entity = getCrudRepository().findOne(key);
@ -86,7 +87,7 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D> implements Dao<
public boolean removeById(UUID key) { public boolean removeById(UUID key) {
getCrudRepository().delete(key); getCrudRepository().delete(key);
log.debug("Remove request: {}", key); log.debug("Remove request: {}", key);
return getCrudRepository().equals(key); return getCrudRepository().findOne(key) == null;
} }
@Override @Override

30
dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java
View File

@ -31,8 +31,7 @@ import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.*;
import static org.junit.Assert.assertNotNull;
/** /**
* Created by Valerii Sosliuk on 4/30/2017. * Created by Valerii Sosliuk on 4/30/2017.
@ -46,10 +45,7 @@ public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest {
@DatabaseSetup("classpath:dbunit/empty_dataset.xml") @DatabaseSetup("classpath:dbunit/empty_dataset.xml")
public void testSave() throws IOException { public void testSave() throws IOException {
UUID id = UUIDs.timeBased(); UUID id = UUIDs.timeBased();
RuleMetaData ruleMetaData = new RuleMetaData(); RuleMetaData ruleMetaData = getRuleMetaData(id);
ruleMetaData.setId(new RuleId(id));
ruleMetaData.setTenantId(new TenantId(UUIDs.timeBased()));
ruleMetaData.setName("test");
String filters = "{\"filters\":\"value-1\"}"; String filters = "{\"filters\":\"value-1\"}";
String processor = "{\"processor\":\"value-2\"}"; String processor = "{\"processor\":\"value-2\"}";
String action = "{\"action\":\"value-3\"}"; String action = "{\"action\":\"value-3\"}";
@ -68,6 +64,19 @@ public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest {
assertEquals(additionalInfo, savedRule.getAdditionalInfo().toString()); assertEquals(additionalInfo, savedRule.getAdditionalInfo().toString());
} }
@Test
@DatabaseSetup("classpath:dbunit/empty_dataset.xml")
public void testDelete() throws IOException {
UUID id = UUIDs.timeBased();
RuleMetaData ruleMetaData = getRuleMetaData(id);
ruleDao.save(ruleMetaData);
RuleMetaData savedRule = ruleDao.findById(id);
assertNotNull(savedRule);
assertTrue(ruleDao.removeById(id));
RuleMetaData afterDelete = ruleDao.findById(id);
assertNull(afterDelete);
}
@Test @Test
@DatabaseSetup("classpath:dbunit/rule.xml") @DatabaseSetup("classpath:dbunit/rule.xml")
public void testFindRulesByPlugin() { public void testFindRulesByPlugin() {
@ -135,4 +144,13 @@ public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest {
ruleMetaData.setPluginToken(pluginToken); ruleMetaData.setPluginToken(pluginToken);
ruleDao.save(ruleMetaData); ruleDao.save(ruleMetaData);
} }
private RuleMetaData getRuleMetaData(UUID id) throws IOException {
RuleMetaData ruleMetaData = new RuleMetaData();
ruleMetaData.setId(new RuleId(id));
ruleMetaData.setTenantId(new TenantId(UUIDs.timeBased()));
ruleMetaData.setName("test");
return ruleMetaData;
}
} }