Issue-ID: HOLMES-365
Signed-off-by: tang peng <tang.peng5@zte.com.cn>
Change-Id: I682c0e65b3382eda5d98bffd2459303e630828ca
@SqlQuery("SELECT * FROM ENGINE_ENTITY")
List<EngineEntity> getAllEntities();
@SqlQuery("SELECT * FROM ENGINE_ENTITY")
List<EngineEntity> getAllEntities();
+ @SqlQuery("SELECT DISTINCT(ENGINEINSTANCE) FROM APLUS_RULE")
+ List<String> getLegacyEngines();
+
@SqlUpdate("INSERT INTO ENGINE_ENTITY VALUES (:id, :ip, :port, :lastModified)")
void insertEntity(@BindBean EngineEntity entity);
@SqlUpdate("INSERT INTO ENGINE_ENTITY VALUES (:id, :ip, :port, :lastModified)")
void insertEntity(@BindBean EngineEntity entity);
package org.onap.holmes.common.engine.service;
package org.onap.holmes.common.engine.service;
-import org.glassfish.jersey.spi.Contract;
+import org.jvnet.hk2.annotations.Contract;
import org.onap.holmes.common.engine.entity.EngineEntity;
import java.util.List;
import org.onap.holmes.common.engine.entity.EngineEntity;
import java.util.List;
public interface EngineEntityService {
EngineEntity getEntity(String id);
List<EngineEntity> getAllEntities();
public interface EngineEntityService {
EngineEntity getEntity(String id);
List<EngineEntity> getAllEntities();
+ List<String> getLegacyEngines();
void updateEntity(EngineEntity entity);
void insertEntity(EngineEntity entity);
void deleteEntity(String id);
void updateEntity(EngineEntity entity);
void insertEntity(EngineEntity entity);
void deleteEntity(String id);
return engineEntityDao.getAllEntities();
}
return engineEntityDao.getAllEntities();
}
+ @Override
+ public List<String> getLegacyEngines() {
+ return engineEntityDao.getLegacyEngines();
+ }
+
@Override
public void updateEntity(EngineEntity entity) {
engineEntityDao.updateEntity(entity);
@Override
public void updateEntity(EngineEntity entity) {
engineEntityDao.updateEntity(entity);
import org.onap.holmes.common.engine.service.EngineEntityService;
import org.onap.holmes.common.utils.DbDaoUtil;
import org.onap.holmes.common.engine.service.EngineEntityService;
import org.onap.holmes.common.utils.DbDaoUtil;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
import static com.google.common.base.Predicates.notNull;
import static org.hamcrest.core.Is.is;
import static com.google.common.base.Predicates.notNull;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.*;
public class EngineEntityServiceImplTest {
import static org.junit.Assert.*;
public class EngineEntityServiceImplTest {
private EngineEntityService service = new EngineEntityServiceImpl(new DbDaoUtilStub());
private EngineEntityService service = new EngineEntityServiceImpl(new DbDaoUtilStub());
+ @Test
+ public void getLegacyEngines() {
+ List<String> legacyEngines = service.getLegacyEngines();
+ assertThat(legacyEngines.size(), is(2));
+ }
+
@Test
public void getEntity() throws Exception {
EngineEntity entity = service.getEntity("org.onap.holmes_9201");
@Test
public void getEntity() throws Exception {
EngineEntity entity = service.getEntity("org.onap.holmes_9201");
return new ArrayList<>(entitySet);
}
return new ArrayList<>(entitySet);
}
+ @Override
+ public List<String> getLegacyEngines() {
+ return Arrays.asList("org.onap.holmes", "org.onap.holmes.legacy.1");
+ }
+
@Override
public void insertEntity(EngineEntity entity) {
entitySet.add(entity);
@Override
public void insertEntity(EngineEntity entity) {
entitySet.add(entity);