From 1dacac49a9a8f22018ce84f8889b1af79fbbf859 Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Sat, 14 Oct 2017 17:35:16 +0800 Subject: Extract the Common Tool Change-Id: I5d356acd7c8747072acc74bfa5e3560cde7a8724 Issue-ID: HOLMES-75 Signed-off-by: Guangrong Fu --- .../onap/holmes/rulemgt/db/CorrelationRuleDao.java | 2 +- .../rulemgt/db/mapper/CorrelationRuleMapper.java | 49 -------------------- .../db/mapper/CorrelationRuleMapperTest.java | 53 ---------------------- 3 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 rulemgt/src/main/java/org/onap/holmes/rulemgt/db/mapper/CorrelationRuleMapper.java delete mode 100644 rulemgt/src/test/java/org/onap/holmes/rulemgt/db/mapper/CorrelationRuleMapperTest.java diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleDao.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleDao.java index 98553c9..a94c1db 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleDao.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/CorrelationRuleDao.java @@ -18,7 +18,7 @@ package org.onap.holmes.rulemgt.db; import java.util.List; import org.onap.holmes.common.api.entity.CorrelationRule; import org.onap.holmes.common.exception.CorrelationException; -import org.onap.holmes.rulemgt.db.mapper.CorrelationRuleMapper; +import org.onap.holmes.common.utils.CorrelationRuleMapper; import org.skife.jdbi.v2.sqlobject.Bind; import org.skife.jdbi.v2.sqlobject.BindBean; import org.skife.jdbi.v2.sqlobject.GetGeneratedKeys; diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/mapper/CorrelationRuleMapper.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/mapper/CorrelationRuleMapper.java deleted file mode 100644 index 98d7d01..0000000 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/db/mapper/CorrelationRuleMapper.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright 2017 ZTE Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.onap.holmes.rulemgt.db.mapper; - -import org.onap.holmes.common.api.entity.CorrelationRule; -import org.skife.jdbi.v2.StatementContext; -import org.skife.jdbi.v2.tweak.ResultSetMapper; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Properties; - -public class CorrelationRuleMapper implements ResultSetMapper { - @Override - public CorrelationRule map(int i, ResultSet resultSet, StatementContext statementContext) throws SQLException { - CorrelationRule correlationRule = new CorrelationRule(); - correlationRule.setName(resultSet.getString("name")); - correlationRule.setRid(resultSet.getString("rid")); - correlationRule.setDescription(resultSet.getString("description")); - correlationRule.setEnabled(resultSet.getInt("enable")); - correlationRule.setTemplateID(resultSet.getInt("templateID")); - correlationRule.setEngineID(resultSet.getString("engineID")); - correlationRule.setEngineType(resultSet.getString("engineType")); - correlationRule.setCreator(resultSet.getString("creator")); - correlationRule.setCreateTime(resultSet.getDate("createTime")); - correlationRule.setModifier(resultSet.getString("updator")); - correlationRule.setUpdateTime(resultSet.getDate("updateTime")); - correlationRule.setParams((Properties)resultSet.getObject("params")); - correlationRule.setContent(resultSet.getString("content")); - correlationRule.setVendor(resultSet.getString("vendor")); - correlationRule.setPackageName(resultSet.getString("package")); - correlationRule.setClosedControlLoopName(resultSet.getString("ctrlloop")); - return correlationRule; - } - -} diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/mapper/CorrelationRuleMapperTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/mapper/CorrelationRuleMapperTest.java deleted file mode 100644 index 3939994..0000000 --- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/mapper/CorrelationRuleMapperTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright 2017 ZTE Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.onap.holmes.rulemgt.db.mapper; - -import static org.easymock.EasyMock.expect; - -import java.sql.Date; -import java.sql.ResultSet; -import java.util.Properties; -import org.junit.Test; -import org.powermock.api.easymock.PowerMock; - -public class CorrelationRuleMapperTest { - - @Test - public void map() throws Exception { - CorrelationRuleMapper mapper = new CorrelationRuleMapper(); - ResultSet resultSet = PowerMock.createMock(ResultSet.class); - expect(resultSet.getString("name")).andReturn(""); - expect(resultSet.getString("rid")).andReturn(""); - expect(resultSet.getString("description")).andReturn(""); - expect(resultSet.getInt("enable")).andReturn(0); - expect(resultSet.getInt("templateID")).andReturn(1); - expect(resultSet.getString("engineID")).andReturn(""); - expect(resultSet.getString("engineType")).andReturn(""); - expect(resultSet.getString("creator")).andReturn(""); - expect(resultSet.getDate("createTime")).andReturn(new Date(System.currentTimeMillis())); - expect(resultSet.getString("updator")).andReturn(""); - expect(resultSet.getDate("updateTime")).andReturn(new Date(System.currentTimeMillis())); - expect(resultSet.getObject("params")).andReturn(new Properties()); - expect(resultSet.getString("content")).andReturn(""); - expect(resultSet.getString("vendor")).andReturn(""); - expect(resultSet.getString("package")).andReturn(""); - expect(resultSet.getString("ctrlloop")).andReturn(""); - PowerMock.replay(resultSet); - mapper.map(0, resultSet, null); - PowerMock.verify(resultSet); - } -} \ No newline at end of file -- cgit 1.2.3-korg