Move HawkularErrorManager to ErrorsManager in services directory.

hawkular · Aug 4, 2015 · 8972f38 · 8972f38
1 parent 613d453
commit 8972f38
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 64 deletions.
diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerAlertsDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerAlertsDetails.ts
@@ -17,7 +17,7 @@
 
 /// <reference path="../metricsPlugin.ts"/>
 /// <reference path="../services/alertsManager.ts"/>
-/// <reference path="../errorManager.ts"/>
+/// <reference path="../services/errorsManager.ts"/>
 
 module HawkularMetrics {
 

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerDatasourcesDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerDatasourcesDetails.ts
@@ -17,7 +17,7 @@
 
 /// <reference path="../metricsPlugin.ts"/>
 /// <reference path="../services/alertsManager.ts"/>
-/// <reference path="../errorManager.ts"/>
+/// <reference path="../services/errorsManager.ts"/>
 
 module HawkularMetrics {
 

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts
@@ -17,15 +17,15 @@
 
 /// <reference path="../metricsPlugin.ts"/>
 /// <reference path="../services/alertsManager.ts"/>
-/// <reference path="../errorManager.ts"/>
+/// <reference path="../services/errorsManager.ts"/>
 
 module HawkularMetrics {
 
   export class AppServerDeploymentsDetailsController {
     /// this is for minification purposes
     public static $inject = ['$location', '$scope', '$rootScope', '$interval', '$log', '$filter', '$routeParams',
       '$modal', 'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularOps', 'HawkularAlertsManager',
-      'HawkularErrorManager', '$q', 'md5', 'NotificationsService' ];
+      'ErrorsManager', '$q', 'md5', 'NotificationsService' ];
 
     private autoRefreshPromise: ng.IPromise<number>;
     private resourceList;
@@ -47,7 +47,7 @@ module HawkularMetrics {
       private HawkularAlert: any,
       private HawkularOps: any,
       private HawkularAlertsManager: HawkularMetrics.IHawkularAlertsManager,
-      private HawkularErrorManager: HawkularMetrics.IHawkularErrorManager,
+      private ErrorsManager: HawkularMetrics.IErrorsManager,
       private $q: ng.IQService,
       private md5: any,
       private NotificationsService: INotificationsService ) {

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerJmsDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerJmsDetails.ts
@@ -17,7 +17,7 @@
 
 /// <reference path="../metricsPlugin.ts"/>
 /// <reference path="../services/alertsManager.ts"/>
-/// <reference path="../errorManager.ts"/>
+/// <reference path="../services/errorsManager.ts"/>
 
 module HawkularMetrics {
 

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmAlerts.ts
@@ -18,12 +18,12 @@
 /// <reference path="../metricsPlugin.ts"/>
 /// <reference path="../../includes.ts"/>
 /// <reference path="../services/alertsManager.ts"/>
-/// <reference path="../errorManager.ts"/>
+/// <reference path="../services/errorsManager.ts"/>
 
 module HawkularMetrics {
 
   export class JvmAlertController {
-    public static  $inject = ['$scope', 'HawkularAlert', 'HawkularAlertsManager', 'HawkularErrorManager', '$log', '$q',
+    public static  $inject = ['$scope', 'HawkularAlert', 'HawkularAlertsManager', 'ErrorsManager', '$log', '$q',
       '$rootScope', '$routeParams', '$modal', '$interval', 'HkHeaderParser'];
 
     private resourceId: string;
@@ -43,7 +43,7 @@ module HawkularMetrics {
     constructor(private $scope:any,
                 private HawkularAlert:any,
                 private HawkularAlertsManager: HawkularMetrics.IHawkularAlertsManager,
-                private HawkularErrorManager: HawkularMetrics.IHawkularErrorManager,
+                private ErrorsManager: HawkularMetrics.IErrorsManager,
                 private $log: ng.ILogService,
                 private $q: ng.IQService,
                 private $rootScope: any,
@@ -136,7 +136,7 @@ module HawkularMetrics {
         this.headerLinks = this.HkHeaderParser.parse(queriedAlerts.headers);
         this.alertList = queriedAlerts.alertList;
         this.alertList.$resolved = true; // FIXME
-      }, (error) => { return this.HawkularErrorManager.errorHandler(error, 'Error fetching alerts.'); });
+      }, (error) => { return this.ErrorsManager.errorHandler(error, 'Error fetching alerts.'); });
       */
     }
 
@@ -163,7 +163,7 @@ module HawkularMetrics {
   _module.controller('JvmAlertController', JvmAlertController);
 
   export class JvmAlertSetupController {
-    public static  $inject = ['$scope', 'HawkularAlert', 'HawkularAlertsManager', 'HawkularErrorManager', '$log', '$q',
+    public static  $inject = ['$scope', 'HawkularAlert', 'HawkularAlertsManager', 'ErrorsManager', '$log', '$q',
       '$rootScope', '$routeParams', '$modalInstance', 'HawkularMetric'];
 
     private resourceId: string;
@@ -188,7 +188,7 @@ module HawkularMetrics {
     constructor(public $scope:any,
                 private HawkularAlert:any,
                 private HawkularAlertsManager: HawkularMetrics.IHawkularAlertsManager,
-                private HawkularErrorManager: HawkularMetrics.IHawkularErrorManager,
+                private ErrorsManager: HawkularMetrics.IErrorsManager,
                 private $log: ng.ILogService,
                 private $q: ng.IQService,
                 private $rootScope: any,
@@ -291,24 +291,24 @@ module HawkularMetrics {
       this.HawkularAlertsManager.addEmailAction(this.trigger.actions.email[0]).then(()=> {
           return this.HawkularAlertsManager.updateTrigger(this.trigger.id, this.trigger);
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error saving email action.', errorCallback);
+        return this.ErrorsManager.errorHandler(error, 'Error saving email action.', errorCallback);
       }).then(()=> {
         this.dampening.evalTimeSetting = this.responseDuration;
 
         return this.HawkularAlertsManager.updateDampening(this.trigger.id,this.dampening.dampeningId, this.dampening);
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error updating trigger', errorCallback);
+        return this.ErrorsManager.errorHandler(error, 'Error updating trigger', errorCallback);
       }).then(()=> {
         this.conditionGt.thresholdHigh = this.conditionGtEnabled ? this.maxUsage * this.conditionGtPercent / 100 :
           this.maxUsage;
         this.conditionGt.thresholdLow = this.conditionLtEnabled ? this.maxUsage * this.conditionLtPercent / 100 : 0;
         return this.HawkularAlertsManager.updateCondition(this.trigger.id, this.conditionGt.conditionId,
           this.conditionGt);
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error updating dampening.', errorCallback);
+        return this.ErrorsManager.errorHandler(error, 'Error updating dampening.', errorCallback);
       }).then(angular.noop, (error)=> {
         isError = true;
-        return this.HawkularErrorManager.errorHandler(error, 'Error updating conditionGt condition.', errorCallback);
+        return this.ErrorsManager.errorHandler(error, 'Error updating conditionGt condition.', errorCallback);
       }).finally(()=> {
         this.saveProgress = false;
 

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmDetails.ts
@@ -17,7 +17,7 @@
 
 /// <reference path="../metricsPlugin.ts"/>
 /// <reference path="../services/alertsManager.ts"/>
-/// <reference path="../errorManager.ts"/>
+/// <reference path="../services/errorsManager.ts"/>
 
 module HawkularMetrics {
 
@@ -31,7 +31,7 @@ module HawkularMetrics {
     /// this is for minification purposes
     public static $inject = ['$location', '$scope', '$rootScope', '$interval', '$log', '$filter', '$routeParams',
       '$modal', '$window', 'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager',
-      'HawkularErrorManager', '$q', 'md5'];
+      'ErrorsManager', '$q', 'md5'];
 
     public static USED_COLOR = '#1884c7'; /// blue
     public static MAXIMUM_COLOR = '#f57f20'; /// orange
@@ -60,7 +60,7 @@ module HawkularMetrics {
       private HawkularMetric: any,
       private HawkularAlert: any,
       private HawkularAlertsManager: HawkularMetrics.IHawkularAlertsManager,
-      private HawkularErrorManager: HawkularMetrics.IHawkularErrorManager,
+      private ErrorsManager: HawkularMetrics.IErrorsManager,
       private $q: ng.IQService,
       private md5: any ) {
         $scope.vm = this;
@@ -90,7 +90,7 @@ module HawkularMetrics {
         HawkularMetrics.AlertType.THRESHOLD).then((data)=> {
           this.alertList = data.alertList;
         }, (error) => {
-          return this.HawkularErrorManager.errorHandler(error, 'Error fetching alerts.');
+          return this.ErrorsManager.errorHandler(error, 'Error fetching alerts.');
         });
     }
 

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerTransactionsDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerTransactionsDetails.ts
@@ -17,7 +17,7 @@
 
 /// <reference path="../metricsPlugin.ts"/>
 /// <reference path="../services/alertsManager.ts"/>
-/// <reference path="../errorManager.ts"/>
+/// <reference path="../services/errorsManager.ts"/>
 
 module HawkularMetrics {
 

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerWebDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerWebDetails.ts
@@ -17,15 +17,15 @@
 
 /// <reference path="../metricsPlugin.ts"/>
 /// <reference path="../services/alertsManager.ts"/>
-/// <reference path="../errorManager.ts"/>
+/// <reference path="../services/errorsManager.ts"/>
 
 module HawkularMetrics {
 
   export class AppServerWebDetailsController {
 
     /// this is for minification purposes
     public static $inject = ['$location', '$scope', '$rootScope', '$interval', '$log', '$filter', '$routeParams',
-      '$modal', 'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager', 'HawkularErrorManager',
+      '$modal', 'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager', 'ErrorsManager',
       '$q', '$window', 'md5'];
 
     public static MAX_ACTIVE_COLOR = '#1884c7'; /// blue
@@ -53,7 +53,7 @@ module HawkularMetrics {
                 private HawkularMetric: any,
                 private HawkularAlert: any,
                 private HawkularAlertsManager: HawkularMetrics.IHawkularAlertsManager,
-                private HawkularErrorManager: HawkularMetrics.IHawkularErrorManager,
+                private ErrorsManager: HawkularMetrics.IErrorsManager,
                 private $q: ng.IQService,
                 private $window: any,
                 private md5: any,

diff --git a/console/src/main/scripts/plugins/metrics/ts/metricsAlerts.ts b/console/src/main/scripts/plugins/metrics/ts/metricsAlerts.ts
@@ -18,12 +18,12 @@
 /// <reference path="metricsPlugin.ts"/>
 /// <reference path="../../includes.ts"/>
 /// <reference path="services/alertsManager.ts"/>
-/// <reference path="errorManager.ts"/>
+/// <reference path="services/errorsManager.ts"/>
 
 module HawkularMetrics {
 
   export class MetricsAlertController {
-    public static  $inject = ['$scope', 'HawkularAlert', 'HawkularAlertsManager', 'HawkularErrorManager', '$log', '$q',
+    public static  $inject = ['$scope', 'HawkularAlert', 'HawkularAlertsManager', 'ErrorsManager', '$log', '$q',
       '$rootScope', '$routeParams', '$modal', '$interval', 'HkHeaderParser'];
 
     private metricId: string; /// @todo: use MetricId
@@ -42,7 +42,7 @@ module HawkularMetrics {
     constructor(private $scope:any,
                 private HawkularAlert:any,
                 private HawkularAlertsManager: HawkularMetrics.IHawkularAlertsManager,
-                private HawkularErrorManager: HawkularMetrics.IHawkularErrorManager,
+                private ErrorsManager: HawkularMetrics.IErrorsManager,
                 private $log: ng.ILogService,
                 private $q: ng.IQService,
                 private $rootScope: IHawkularRootScope,
@@ -96,7 +96,7 @@ module HawkularMetrics {
         this.headerLinks = this.HkHeaderParser.parse(queriedAlerts.headers);
         this.alertList = queriedAlerts.alertList;
         this.alertList.$resolved = true; // FIXME
-      }, (error) => { return this.HawkularErrorManager.errorHandler(error, 'Error fetching alerts.'); });
+      }, (error) => { return this.ErrorsManager.errorHandler(error, 'Error fetching alerts.'); });
     }
 
     public setPage(page:number):void {
@@ -124,7 +124,7 @@ module HawkularMetrics {
   _module.controller('MetricsAlertController', MetricsAlertController);
 
   export class MetricsAlertSetupController {
-    public static  $inject = ['$scope', 'HawkularAlert', 'HawkularAlertsManager', 'HawkularErrorManager', '$log', '$q',
+    public static  $inject = ['$scope', 'HawkularAlert', 'HawkularAlertsManager', 'ErrorsManager', '$log', '$q',
       '$rootScope', '$routeParams', '$modalInstance'];
 
     private metricId: string;
@@ -161,7 +161,7 @@ module HawkularMetrics {
     constructor(public $scope:any,
                 private HawkularAlert:any,
                 private HawkularAlertsManager: HawkularMetrics.IHawkularAlertsManager,
-                private HawkularErrorManager: HawkularMetrics.IHawkularErrorManager,
+                private ErrorsManager: HawkularMetrics.IErrorsManager,
                 private $log: ng.ILogService,
                 private $q: ng.IQService,
                 private $rootScope: any,
@@ -181,7 +181,7 @@ module HawkularMetrics {
         this.$log.debug('this.trigger_thres', this.trigger_thres);
         return HawkularAlert.Dampening.query({triggerId: $routeParams.resourceId + '_trigger_thres'}).$promise;
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error fetching threshold trigger.');
+        return this.ErrorsManager.errorHandler(error, 'Error fetching threshold trigger.');
       }).then((data)=> {
 
         // Make sure, the AUTORESOLVE entity is the 2nd one
@@ -200,7 +200,7 @@ module HawkularMetrics {
         this.$log.debug('this.trigger_thres_damp', this.trigger_thres_damp);
         return HawkularAlert.Condition.query({triggerId: $routeParams.resourceId + '_trigger_thres'}).$promise;
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error fetching threshold trigger dampening.');
+        return this.ErrorsManager.errorHandler(error, 'Error fetching threshold trigger dampening.');
       }).then((data)=> {
 
         // Make sure, the AUTORESOLVE condition is the 2nd one
@@ -211,7 +211,7 @@ module HawkularMetrics {
         this.alertSetupBackup.trigger_thres_cond = angular.copy(this.trigger_thres_cond);
         this.$log.debug('this.trigger_thres_cond', this.trigger_thres_cond);
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error fetching threshold trigger condition.');
+        return this.ErrorsManager.errorHandler(error, 'Error fetching threshold trigger condition.');
       });
 
       // Get the data about Availability Trigger
@@ -221,7 +221,7 @@ module HawkularMetrics {
         this.$log.debug('this.trigger_avail', this.trigger_avail);
         return HawkularAlert.Dampening.query({triggerId: $routeParams.resourceId + '_trigger_avail'}).$promise;
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error fetching availability trigger.');
+        return this.ErrorsManager.errorHandler(error, 'Error fetching availability trigger.');
       }).then((data)=> {
         this.trigger_avail_damp = [];
         this.trigger_avail_damp[0] = data[data[1].triggerMode === 'AUTORESOLVE' ? 0 : 1];
@@ -235,7 +235,7 @@ module HawkularMetrics {
 
         this.$log.debug('this.trigger_avail_damp', this.trigger_avail_damp);
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error fetching availability trigger dampening.');
+        return this.ErrorsManager.errorHandler(error, 'Error fetching availability trigger dampening.');
       });
 
       this.metricId = $routeParams.resourceId;
@@ -290,14 +290,14 @@ module HawkularMetrics {
           return this.HawkularAlertsManager.updateTrigger(this.trigger_thres.id, this.trigger_thres);
         }
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error saving email action.', errorCallback);
+        return this.ErrorsManager.errorHandler(error, 'Error saving email action.', errorCallback);
       }).then(() => {
         this.trigger_avail.actions = this.trigger_thres.actions;
         if(!angular.equals(this.alertSetupBackup.trigger_avail, this.trigger_avail)) {
           return this.HawkularAlertsManager.updateTrigger(this.trigger_avail.id, this.trigger_avail);
         }
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error updating threshold trigger.', errorCallback);
+        return this.ErrorsManager.errorHandler(error, 'Error updating threshold trigger.', errorCallback);
       }).then(()=> {
         if (!this.thresDampDurationEnabled) {
           this.trigger_thres_damp[0].evalTimeSetting = 0;
@@ -308,14 +308,14 @@ module HawkularMetrics {
               this.trigger_thres_damp[0].dampeningId, this.trigger_thres_damp[0]);
         }
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error updating availability trigger.', errorCallback);
+        return this.ErrorsManager.errorHandler(error, 'Error updating availability trigger.', errorCallback);
       }).then(()=> {
         if(!angular.equals(this.alertSetupBackup.trigger_avail_damp[0], this.trigger_avail_damp[0])) {
           this.HawkularAlertsManager.updateDampening(this.trigger_avail.id, this.trigger_avail_damp[0].dampeningId,
               this.trigger_avail_damp[0]);
         }
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error updating threshold trigger dampening.',
+        return this.ErrorsManager.errorHandler(error, 'Error updating threshold trigger dampening.',
             errorCallback);
       }).then(()=> {
         if(!angular.equals(this.alertSetupBackup.trigger_thres_cond[0], this.trigger_thres_cond[0])) {
@@ -329,10 +329,10 @@ module HawkularMetrics {
           });
         }
       }, (error)=> {
-        return this.HawkularErrorManager.errorHandler(error, 'Error updating availability dampening.', errorCallback);
+        return this.ErrorsManager.errorHandler(error, 'Error updating availability dampening.', errorCallback);
       }).then(angular.noop, (error)=> {
         isError = true;
-        return this.HawkularErrorManager.errorHandler(error, 'Error updating availability condition.', errorCallback);
+        return this.ErrorsManager.errorHandler(error, 'Error updating availability condition.', errorCallback);
       }).finally(()=> {
         this.saveProgress = false;
 

diff --git a/console/src/main/scripts/plugins/metrics/ts/metricsAppServerDetails.ts b/console/src/main/scripts/plugins/metrics/ts/metricsAppServerDetails.ts
@@ -17,7 +17,7 @@
 
 /// <reference path="metricsPlugin.ts"/>
 /// <reference path="services/alertsManager.ts"/>
-/// <reference path="errorManager.ts"/>
+/// <reference path="services/errorsManager.ts"/>
 
 module HawkularMetrics {
 

diff --git a/console/src/main/scripts/plugins/metrics/ts/metricsAppServerList.ts b/console/src/main/scripts/plugins/metrics/ts/metricsAppServerList.ts
@@ -17,14 +17,14 @@
 
 /// <reference path="metricsPlugin.ts"/>
 /// <reference path="services/alertsManager.ts"/>
-/// <reference path="errorManager.ts"/>
+/// <reference path="services/errorsManager.ts"/>
 
 module HawkularMetrics {
 
   export class AppServerListController {
     /// this is for minification purposes
     public static $inject = ['$location', '$scope', '$rootScope', '$interval', '$log', '$filter', '$modal',
-        'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager', 'HawkularErrorManager', '$q',
+        'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager', 'ErrorsManager', '$q',
         'md5', 'HkHeaderParser'];
 
     private resourceList;
@@ -45,7 +45,7 @@ module HawkularMetrics {
                 private HawkularMetric: any,
                 private HawkularAlert: any,
                 private HawkularAlertsManager: HawkularMetrics.IHawkularAlertsManager,
-                private HawkularErrorManager: HawkularMetrics.IHawkularErrorManager,
+                private ErrorsManager: HawkularMetrics.IErrorsManager,
                 private $q: ng.IQService,
                 private md5: any,
                 private HkHeaderParser: HawkularMetrics.IHkHeaderParser,