--- /dev/null
+/*
+ * Copyright 2022 Huawei Technologies Co., Ltd.
+ *
+ * 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.usecaseui.intentanalysis.common;
+
+public final class ResponseConsts {
+ private ResponseConsts() {
+ throw new IllegalStateException("ResponseConsts class");
+ }
+
+ /**
+ * insert data to database failed.
+ */
+ public static final int RET_INSERT_DATA_FAIL = 10001;
+
+ /**
+ * update data from database failed.
+ */
+ public static final int RET_UPDATE_DATA_FAIL = 10002;
+
+ /**
+ * query data from database is empty.
+ */
+ public static final int RET_QUERY_DATA_EMPTY = 10003;
+
+ /**
+ * delete data from database failed.
+ */
+ public static final int RET_DELETE_DATA_FAIL = 10004;
+}
--- /dev/null
+/*
+ * Copyright 2022 Huawei Technologies Co., Ltd.
+ *
+ * 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.usecaseui.intentanalysis.exception;
+
+public class CommonException extends RuntimeException{
+
+ private ErrorMessage errMsg;
+
+ public CommonException(String message, int ret) {
+ super(message);
+ errMsg = new ErrorMessage(ret, null);
+ }
+}
--- /dev/null
+/*
+ * Copyright 2022 Huawei Technologies Co., Ltd.
+ *
+ * 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.usecaseui.intentanalysis.exception;
+
+public class DataBaseException extends CommonException {
+
+ public DataBaseException(String message, int ret) {
+ super(message, ret);
+ }
+}
--- /dev/null
+/*
+ * Copyright 2022 Huawei Technologies Co., Ltd.
+ *
+ * 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.usecaseui.intentanalysis.exception;
+
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ErrorMessage {
+
+ private int retCode;
+
+ private List<String> params;
+
+ public ErrorMessage(int retCode, List<String> params) {
+ this.retCode = retCode;
+ this.params = params;
+ }
+}
@Mapper
public interface ExpectationMapper {
- void insertExpectationList(@Param(value = "expectationList") List<Expectation> expectationList, @Param(value = "intentId") String intentId);
+ int insertExpectationList(@Param(value = "expectationList") List<Expectation> expectationList, @Param(value = "intentId") String intentId);
List<Expectation> selectExpectationByIntentId(String intentId);
- void deleteExpectationByIntentId(String intentId);
+ int deleteExpectationByIntentId(String intentId);
- void updateExpectation(Expectation expectation);
+ int updateExpectation(Expectation expectation);
- void insertExpectation(@Param(value = "expectation") Expectation expectation, @Param(value = "intentId") String intentId);
+ int insertExpectation(@Param(value = "expectation") Expectation expectation, @Param(value = "intentId") String intentId);
- void deleteExpectationById(String expectationId);
+ int deleteExpectationById(String expectationId);
}
@Mapper
public interface IntentMapper {
- void insertIntent(Intent intent);
+ int insertIntent(Intent intent);
- void updateIntent(Intent intent);
+ int updateIntent(Intent intent);
Intent selectIntentById(String intentId);
List<Intent> selectIntents();
- void deleteIntentById(String intentId);
+ int deleteIntentById(String intentId);
}
@Mapper
public interface StateMapper {
- void insertStateList(@Param(value = "stateList") List<State> state, @Param(value = "expectationId") String expectationId);
+ int insertStateList(@Param(value = "stateList") List<State> state, @Param(value = "expectationId") String expectationId);
List<State> selectStateByExpectation(String expectationId);
- void deleteStateByExpectationId(String expectationId);
+ int deleteStateByExpectationId(String expectationId);
- void updateState(State state);
+ int updateState(State state);
- void insertState(@Param(value = "state") State state, @Param(value = "expectationId") String expectationId);
+ int insertState(@Param(value = "state") State state, @Param(value = "expectationId") String expectationId);
- void deleteStateById(String stateId);
+ int deleteStateById(String stateId);
}
import org.onap.usecaseui.intentanalysis.bean.models.Expectation;
import org.onap.usecaseui.intentanalysis.bean.models.State;
+import org.onap.usecaseui.intentanalysis.exception.DataBaseException;
import org.onap.usecaseui.intentanalysis.mapper.ExpectationMapper;
import org.onap.usecaseui.intentanalysis.service.ExpectationService;
import org.onap.usecaseui.intentanalysis.service.StateService;
import org.springframework.stereotype.Service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.onap.usecaseui.intentanalysis.common.ResponseConsts;
import java.util.ArrayList;
stateService.createStateList(expectation.getStateList(), expectation.getExpectationId());
}
}
- expectationMapper.insertExpectationList(expectationList, intentId);
+ int res = expectationMapper.insertExpectationList(expectationList, intentId);
+ if (res < 1) {
+ String msg = "Create expectation to database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_INSERT_DATA_FAIL);
+ }
}
@Override
public List<Expectation> getExpectationListByIntentId(String intentId) {
List<Expectation> expectationList = expectationMapper.selectExpectationByIntentId(intentId);
+ if (expectationList == null) {
+ String msg = String.format("Intent id %s doesn't exist in database.", intentId);
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_QUERY_DATA_EMPTY);
+ }
for (Expectation expectation : expectationList) {
List<State> stateList = stateService.getStateListByExpectationId(expectation.getExpectationId());
expectation.setStateList(stateList);
@Override
public void deleteExpectationListById(String intentId) {
List<Expectation> expectationList = expectationMapper.selectExpectationByIntentId(intentId);
- expectationMapper.deleteExpectationByIntentId(intentId);
+ if (expectationList == null) {
+ String msg = String.format("Intent id %s doesn't exist in database.", intentId);
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_QUERY_DATA_EMPTY);
+ }
+ int res = expectationMapper.deleteExpectationByIntentId(intentId);
+ if (res < 1) {
+ String msg = "Delete expectation in database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_DELETE_DATA_FAIL);
+ }
for (Expectation expectation : expectationList) {
stateService.deleteStateListByExpectationId(expectation.getExpectationId());
}
public void updateExpectationListById(List<Expectation> expectationList, String intentId) {
List<Expectation> expectationDBList = expectationMapper.selectExpectationByIntentId(intentId);
if (expectationDBList == null) {
- LOGGER.error("Intent ID {} doesn't exist in database.", intentId);
- throw new IllegalArgumentException("This intent ID doesn't exist in database.");
+ String msg = String.format("Intent id %s doesn't exist in database.", intentId);
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_QUERY_DATA_EMPTY);
}
List<String> expectationDBIdList = new ArrayList<>();
for (Expectation expectationDB : expectationDBList) {
for (Expectation expectation : expectationList) {
if (expectationDBIdList.contains(expectation.getExpectationId())) {
stateService.updateStateListByExpectationId(expectation.getStateList(), expectation.getExpectationId());
- expectationMapper.updateExpectation(expectation);
+ int res = expectationMapper.updateExpectation(expectation);
+ if (res < 1) {
+ String msg = "Update expectation in database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_UPDATE_DATA_FAIL);
+ }
expectationDBIdList.remove(expectation.getExpectationId());
} else {
expectationService.insertExpectation(expectation, intentId);
@Override
public void insertExpectation(Expectation expectation, String intentId) {
- expectationMapper.insertExpectation(expectation, intentId);
+ int res = expectationMapper.insertExpectation(expectation, intentId);
+ if (res < 1) {
+ String msg = "Create expectation to database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_INSERT_DATA_FAIL);
+ }
}
@Override
public void deleteExpectationById(String expectationId) {
- expectationMapper.deleteExpectationById(expectationId);
+ int res = expectationMapper.deleteExpectationById(expectationId);
+ if (res < 1) {
+ String msg = "Delete expectation in database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_DELETE_DATA_FAIL);
+ }
}
}
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.onap.usecaseui.intentanalysis.exception.DataBaseException;
+import org.onap.usecaseui.intentanalysis.common.ResponseConsts;
import java.util.ArrayList;
import java.util.List;
public List<Intent> getIntentList() {
List<Intent> intentList = intentMapper.selectIntents();
if (intentList == null || intentList.size() <= 0) {
- return new ArrayList<>();
+ String msg = "Intent list doesn't exist in the intent database.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_QUERY_DATA_EMPTY);
}
for (Intent intent : intentList) {
intent.setExpectationList(expectationService.getExpectationListByIntentId(intent.getIntentId()));
intent.setExpectationList(expectationService.getExpectationListByIntentId(intent.getIntentId()));
return intent;
} else {
- String msg = "Intent Id requested doesn't exist in the intent database";
+ String msg = String.format("Intent id %s doesn't exist in database.", intentId);
LOGGER.error(msg);
- throw new IllegalArgumentException(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_QUERY_DATA_EMPTY);
}
}
@Transactional(rollbackFor = RuntimeException.class)
@Override
public Intent createIntent(Intent intent) {
- intentMapper.insertIntent(intent);
+ int res = intentMapper.insertIntent(intent);
+ if (res < 1) {
+ String msg = "Create intent to database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_INSERT_DATA_FAIL);
+ }
// saving expectation list into expectation table
expectationService.createExpectationList(intent.getExpectationList(), intent.getIntentId());
LOGGER.info("Intent was successfully created.");
public Intent updateIntent(Intent intent) {
Intent intentDB = intentMapper.selectIntentById(intent.getIntentId());
if (intentDB == null) {
- LOGGER.error("intent id {} not exists in db.", intent.getIntentId());
+ String msg = String.format("Intent id %s doesn't exist in database.", intent.getIntentId());
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_QUERY_DATA_EMPTY);
}
expectationService.updateExpectationListById(intent.getExpectationList(), intent.getIntentId());
- intentMapper.updateIntent(intent);
- LOGGER.info("update intent successfully.");
+ int res = intentMapper.updateIntent(intent);
+ if (res < 1) {
+ String msg = "Update intent in database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_UPDATE_DATA_FAIL);
+ }
+ LOGGER.info("Update intent successfully.");
return intentMapper.selectIntentById(intent.getIntentId());
}
@Override
public void deleteIntentById(String intentId) {
- intentMapper.deleteIntentById(intentId);
+ int res = intentMapper.deleteIntentById(intentId);
+ if (res < 1) {
+ String msg = "Delete intent in database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_DELETE_DATA_FAIL);
+ }
expectationService.deleteExpectationListById(intentId);
- LOGGER.info("intent has been deleted successfully.");
+ LOGGER.info("Intent has been deleted successfully.");
}
}
import org.onap.usecaseui.intentanalysis.bean.models.State;
+import org.onap.usecaseui.intentanalysis.common.ResponseConsts;
+import org.onap.usecaseui.intentanalysis.exception.DataBaseException;
import org.onap.usecaseui.intentanalysis.mapper.StateMapper;
import org.onap.usecaseui.intentanalysis.service.StateService;
import org.slf4j.Logger;
@Override
public void createStateList(List<State> stateList, String expectationId) {
- stateMapper.insertStateList(stateList, expectationId);
+ int res = stateMapper.insertStateList(stateList, expectationId);
+ if (res < 1) {
+ String msg = "Create state to database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_INSERT_DATA_FAIL);
+ }
}
@Override
public List<State> getStateListByExpectationId(String expectationId) {
List<State> stateList = stateMapper.selectStateByExpectation(expectationId);
+ if (stateList == null) {
+ String msg = String.format("Expectation id %s doesn't exist in database.", expectationId);
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_QUERY_DATA_EMPTY);
+ }
return stateList;
}
@Override
public void deleteStateListByExpectationId(String expectationId) {
- stateMapper.deleteStateByExpectationId(expectationId);
+ int res = stateMapper.deleteStateByExpectationId(expectationId);
+ if (res < 1) {
+ String msg = "Delete state in database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_DELETE_DATA_FAIL);
+ }
}
@Override
public void updateStateListByExpectationId(List<State> stateList, String expectationId) {
List<State> stateDBList = stateMapper.selectStateByExpectation(expectationId);
if (stateDBList == null) {
- LOGGER.error("Expectation ID {} doesn't exist in database.", expectationId);
- throw new IllegalArgumentException("This expectation ID doesn't exist in database.");
+ String msg = String.format("Expectation id %s doesn't exist in database.", expectationId);
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_QUERY_DATA_EMPTY);
}
List<String> stateDBIdList = new ArrayList<>();
for (State stateDB : stateDBList) {
}
for (State state : stateList) {
if (stateDBIdList.contains(state.getStateId())) {
- stateMapper.updateState(state);
+ int res = stateMapper.updateState(state);
+ if (res < 1) {
+ String msg = "Update state in database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_UPDATE_DATA_FAIL);
+ }
stateDBIdList.remove(state.getStateId());
} else {
stateService.insertState(state, expectationId);
@Override
public void insertState(State state, String expectationId) {
- stateMapper.insertState(state, expectationId);
+ int res = stateMapper.insertState(state, expectationId);
+ if (res < 1) {
+ String msg = "Create state to database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_INSERT_DATA_FAIL);
+ }
}
@Override
public void deleteStateById(String stateId) {
- stateMapper.deleteStateById(stateId);
+ int res = stateMapper.deleteStateById(stateId);
+ if (res < 1) {
+ String msg = "Delete state in database failed.";
+ LOGGER.error(msg);
+ throw new DataBaseException(msg, ResponseConsts.RET_DELETE_DATA_FAIL);
+ }
}
}
Code Review / usecase-ui / intent-analysis.git / commitdiff