aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-dao/src
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-04-14 16:01:15 -0700
committerGary Wu <gary.i.wu@huawei.com>2017-07-12 19:03:10 +0000
commit6658660f5c1fad24af6b85cdf26f5fd3dca0346e (patch)
treeecbf936149961d0cbce4b180f5f1f8fdf2cfc15e /catalog-dao/src
parentdd60339b06d252fcb1382aa97ab3d65b37dad021 (diff)
Remove Exceptions.convertToRuntimeEx()
The uses of Exceptions.convertToRuntimeEx() had two problems: 1. The cast from IOException to RuntimeException will fail because they are incompatible types; 2. They make it unclear that an exception is being thrown. This change replaces their uses with direct throws of RuntimeExceptions. Change-Id: I3af60da2bdd3230c568744f747a5910d797073c8 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'catalog-dao/src')
-rw-r--r--catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ESGenericIdDAO.java5
-rw-r--r--catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ESGenericSearchDAO.java5
-rw-r--r--catalog-dao/src/main/java/org/openecomp/sdc/be/dao/utils/Exceptions.java35
3 files changed, 4 insertions, 41 deletions
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ESGenericIdDAO.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ESGenericIdDAO.java
index fb0b160b09..1ab27fc930 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ESGenericIdDAO.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ESGenericIdDAO.java
@@ -36,7 +36,6 @@ import org.elasticsearch.action.get.MultiGetItemResponse;
import org.elasticsearch.action.get.MultiGetResponse;
import org.elasticsearch.client.Client;
import org.openecomp.sdc.be.dao.es.ElasticSearchClient;
-import org.openecomp.sdc.be.dao.utils.Exceptions;
import org.openecomp.sdc.exception.IndexingServiceException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -95,7 +94,7 @@ public abstract class ESGenericIdDAO implements IGenericIdDAO {
try {
ret = (T) jsonMapper.readValue(response.getSourceAsString(), clazz);
} catch (IOException e) {
- Exceptions.convertToRuntimeEx(e);
+ throw new RuntimeException(e);
}
return ret;
}
@@ -119,7 +118,7 @@ public abstract class ESGenericIdDAO implements IGenericIdDAO {
val = jsonMapper.readValue(getItemResponse.getResponse().getSourceAsString(), clazz);
result.add(val);
} catch (IOException e) {
- Exceptions.convertToRuntimeEx(e);
+ throw new RuntimeException(e);
}
}
}
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ESGenericSearchDAO.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ESGenericSearchDAO.java
index c24325aefb..77aac87427 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ESGenericSearchDAO.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/api/ESGenericSearchDAO.java
@@ -31,7 +31,6 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.search.sort.SortBuilder;
import org.openecomp.sdc.be.dao.es.ElasticSearchClient;
-import org.openecomp.sdc.be.dao.utils.Exceptions;
/**
* Elastic search dao that manages search operations.
@@ -83,7 +82,7 @@ public class ESGenericSearchDAO extends ESGenericIdDAO implements IGenericSearch
try {
result.add(getJsonMapper().readValue(searchResponse.getHits().getAt(i).getSourceAsString(), clazz));
} catch (IOException e) {
- Exceptions.convertToRuntimeEx(e);
+ throw new RuntimeException(e);
}
}
@@ -114,7 +113,7 @@ public class ESGenericSearchDAO extends ESGenericIdDAO implements IGenericSearch
val = getJsonMapper().readValue(hit, clazz);
result.add(val);
} catch (IOException e) {
- Exceptions.convertToRuntimeEx(e);
+ throw new RuntimeException(e);
}
}
return result;
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/utils/Exceptions.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/utils/Exceptions.java
deleted file mode 100644
index fd0a6754ab..0000000000
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/utils/Exceptions.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.be.dao.utils;
-
-public final class Exceptions {
- private Exceptions() {
- }
-
- public static RuntimeException convertToRuntimeEx(Throwable t) {
- return Exceptions.<RuntimeException>convertToRTException(t);
- }
-
- @SuppressWarnings("unchecked")
- private static <T extends Throwable> T convertToRTException(Throwable t) throws T {
- throw (T) t;
- }
-}