Change the groupid from openo to onap

[holmes/rule-management.git] / rulemgt / src / main / java / org / onap / holmes / rulemgt / resources / RuleMgtResources.java

diff --git a/rulemgt/src/main/java/org/openo/holmes/rulemgt/resources/RuleMgtResources.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java
similarity index 77%
rename from rulemgt/src/main/java/org/openo/holmes/rulemgt/resources/RuleMgtResources.java
rename to rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java
index f3256b2..04578f7 100644 (file)
--- a/rulemgt/src/main/java/org/openo/holmes/rulemgt/resources/RuleMgtResources.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/resources/RuleMgtResources.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
-package org.openo.holmes.rulemgt.resources;\r
+package org.onap.holmes.rulemgt.resources;\r
 \r
 import com.codahale.metrics.annotation.Timed;\r
 import io.swagger.annotations.Api;\r
@@ -22,7 +22,6 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.SwaggerDefinition;\r
 import java.io.IOException;\r
 import java.util.Locale;\r
-import javax.annotation.PostConstruct;\r
 import javax.inject.Inject;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.ws.rs.DELETE;\r
@@ -37,23 +36,22 @@ import javax.ws.rs.core.MediaType;
 import lombok.extern.slf4j.Slf4j;\r
 import net.sf.json.JSONObject;\r
 import org.jvnet.hk2.annotations.Service;\r
-import org.openo.holmes.common.api.entity.ServiceRegisterEntity;\r
-import org.openo.holmes.common.config.MicroServiceConfig;\r
-import org.openo.holmes.common.exception.CorrelationException;\r
-import org.openo.holmes.common.utils.ExceptionUtil;\r
-import org.openo.holmes.common.utils.I18nProxy;\r
-import org.openo.holmes.common.utils.JacksonUtil;\r
-import org.openo.holmes.common.utils.LanguageUtil;\r
-import org.openo.holmes.common.utils.MSBRegisterUtil;\r
-import org.openo.holmes.common.utils.UserUtil;\r
-import org.openo.holmes.rulemgt.bean.request.RuleCreateRequest;\r
-import org.openo.holmes.rulemgt.bean.request.RuleDeleteRequest;\r
-import org.openo.holmes.rulemgt.bean.request.RuleQueryCondition;\r
-import org.openo.holmes.rulemgt.bean.request.RuleUpdateRequest;\r
-import org.openo.holmes.rulemgt.bean.response.RuleAddAndUpdateResponse;\r
-import org.openo.holmes.rulemgt.bean.response.RuleQueryListResponse;\r
-import org.openo.holmes.rulemgt.constant.RuleMgtConstant;\r
-import org.openo.holmes.rulemgt.wrapper.RuleMgtWrapper;\r
+import org.onap.holmes.common.api.entity.ServiceRegisterEntity;\r
+import org.onap.holmes.common.config.MicroServiceConfig;\r
+import org.onap.holmes.common.exception.CorrelationException;\r
+import org.onap.holmes.common.utils.ExceptionUtil;\r
+import org.onap.holmes.common.utils.JacksonUtil;\r
+import org.onap.holmes.common.utils.LanguageUtil;\r
+import org.onap.holmes.common.utils.MSBRegisterUtil;\r
+import org.onap.holmes.common.utils.UserUtil;\r
+import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest;\r
+import org.onap.holmes.rulemgt.bean.request.RuleDeleteRequest;\r
+import org.onap.holmes.rulemgt.bean.request.RuleQueryCondition;\r
+import org.onap.holmes.rulemgt.bean.request.RuleUpdateRequest;\r
+import org.onap.holmes.rulemgt.bean.response.RuleAddAndUpdateResponse;\r
+import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse;\r
+import org.onap.holmes.rulemgt.constant.RuleMgtConstant;\r
+import org.onap.holmes.rulemgt.wrapper.RuleMgtWrapper;\r
 \r
 @Service\r
 @SwaggerDefinition\r
@@ -81,8 +79,7 @@ public class RuleMgtResources {
             return ruleChangeResponse;\r
         } catch (CorrelationException e) {\r
             log.error("create rule:" + ruleCreateRequest.getRuleName() + " failed", e);\r
-            throw ExceptionUtil.buildExceptionResponse(I18nProxy.getInstance().getValue(locale,\r
-                    e.getMessage()));\r
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
         }\r
     }\r
 \r
@@ -100,8 +97,7 @@ public class RuleMgtResources {
             return ruleChangeResponse;\r
         } catch (CorrelationException e) {\r
             log.error("update rule:" + ruleUpdateRequest.getContent() + " failed", e);\r
-            throw ExceptionUtil.buildExceptionResponse(I18nProxy.getInstance().getValue(locale,\r
-                    e.getMessage()));\r
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
         }\r
     }\r
 \r
@@ -118,8 +114,7 @@ public class RuleMgtResources {
             return true;\r
         } catch (CorrelationException e) {\r
             log.error("delete rule:" + ruleDeleteRequest.getRuleId() + " failed", e);\r
-            throw ExceptionUtil.buildExceptionResponse(I18nProxy.getInstance().getValue(locale,\r
-                    e.getMessage()));\r
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
         }\r
     }\r
 \r
@@ -142,8 +137,7 @@ public class RuleMgtResources {
             return ruleQueryListResponse;\r
         } catch (CorrelationException e) {\r
             log.error("query rule failed,cause query condition conversion failure", e);\r
-            throw ExceptionUtil.buildExceptionResponse(I18nProxy.getInstance().getValue(locale,\r
-                    e.getMessage()));\r
+            throw ExceptionUtil.buildExceptionResponse(e.getMessage());\r
         }\r
     }\r
 \r
@@ -161,8 +155,7 @@ public class RuleMgtResources {
             return ruleQueryCondition;\r
         } catch (IOException e) {\r
             log.warn("queryRequest convert to json failed", e);\r
-            throw ExceptionUtil.buildExceptionResponse(I18nProxy.getInstance().getValue(locale,\r
-                    I18nProxy.RULE_MANAGEMENT_DATA_FORMAT_ERROR));\r
+            throw ExceptionUtil.buildExceptionResponse("The request format is invalid!");\r
         }\r
     }\r
 }\r