From 006d74d3c576fc16d81ca5ba70cab7bb0f220c24 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 31 Jan 2016 11:02:14 +0300
Subject: [PATCH] Renamend ZabbixCache service to ZabbixCachingProxy.

---
 plugins/datasource-zabbix/datasource.js  | 4 ++--
 plugins/datasource-zabbix/zabbixCache.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 40f1378..facae7a 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -19,7 +19,7 @@ function (angular, _, dateMath, utils, metricFunctions) {
 
   /** @ngInject */
   function ZabbixAPIDatasource(instanceSettings, $q, templateSrv, alertSrv, zabbixHelperSrv,
-                               ZabbixAPI, ZabbixCache, QueryProcessor, DataProcessingService) {
+                               ZabbixAPI, ZabbixCachingProxy, QueryProcessor, DataProcessingService) {
 
     // General data source settings
     this.name             = instanceSettings.name;
@@ -39,7 +39,7 @@ function (angular, _, dateMath, utils, metricFunctions) {
     this.zabbixAPI = new ZabbixAPI(this.url, this.username, this.password, this.basicAuth, this.withCredentials);
 
     // Initialize cache service
-    this.zabbixCache = new ZabbixCache(this.zabbixAPI);
+    this.zabbixCache = new ZabbixCachingProxy(this.zabbixAPI);
 
     // Initialize query builder
     this.queryProcessor = new QueryProcessor(this.zabbixCache);
diff --git a/plugins/datasource-zabbix/zabbixCache.js b/plugins/datasource-zabbix/zabbixCache.js
index 57405cc..dc68ff4 100644
--- a/plugins/datasource-zabbix/zabbixCache.js
+++ b/plugins/datasource-zabbix/zabbixCache.js
@@ -10,9 +10,9 @@ function (angular, _, utils) {
 
   // Use factory() instead service() for multiple datasources support.
   // Each datasource instance must initialize its own cache.
-  module.factory('ZabbixCache', function($q) {
+  module.factory('ZabbixCachingProxy', function($q) {
 
-    function ZabbixCache(zabbixAPI, ttl) {
+    function ZabbixCachingProxy(zabbixAPI, ttl) {
       this.zabbixAPI = zabbixAPI;
       this.ttl = ttl;
 
@@ -26,7 +26,7 @@ function (angular, _, utils) {
       this._initialized = undefined;
     }
 
-    var p = ZabbixCache.prototype;
+    var p = ZabbixCachingProxy.prototype;
 
     p.refresh = function () {
       var self = this;
@@ -126,7 +126,7 @@ function (angular, _, utils) {
       });
     }
 
-    return ZabbixCache;
+    return ZabbixCachingProxy;
 
   });