update variable name

Author: zhiyuanliang-ms

src/AzureAppConfigurationImpl.ts

@@ -65,27 +65,27 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
     // Refresh
     #refreshInProgress: boolean = false;
 
-    #watchAll: boolean = false;
-    #refreshInterval: number = DEFAULT_REFRESH_INTERVAL_IN_MS;
     #onRefreshListeners: Array<() => any> = [];
     /**
      * Aka watched settings.
      */
     #sentinels: ConfigurationSettingId[] = [];
-    #refreshTimer: RefreshTimer;
+    #watchAll: boolean = false;
+    #kvRefreshInterval: number = DEFAULT_REFRESH_INTERVAL_IN_MS;
+    #kvRefreshTimer: RefreshTimer;
 
     // Feature flags
-    #featureFlagRefreshInterval: number = DEFAULT_REFRESH_INTERVAL_IN_MS;
-    #featureFlagRefreshTimer: RefreshTimer;
+    #ffRefreshInterval: number = DEFAULT_REFRESH_INTERVAL_IN_MS;
+    #ffRefreshTimer: RefreshTimer;
 
     /**
      * Selectors of key-values obtained from @see AzureAppConfigurationOptions.selectors
      */
-    #keyValueSelectors: PagedSettingSelector[] = [];
+    #kvSelectors: PagedSettingSelector[] = [];
     /**
      * Selectors of feature flags obtained from @see AzureAppConfigurationOptions.featureFlagOptions.selectors
      */
-    #featureFlagSelectors: PagedSettingSelector[] = [];
+    #ffSelectors: PagedSettingSelector[] = [];
 
     // Load balancing
     #lastSuccessfulEndpoint: string = "";
@@ -125,18 +125,18 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
                 if (refreshIntervalInMs < MIN_REFRESH_INTERVAL_IN_MS) {
                     throw new Error(`The refresh interval cannot be less than ${MIN_REFRESH_INTERVAL_IN_MS} milliseconds.`);
                 } else {
-                    this.#refreshInterval = refreshIntervalInMs;
+                    this.#kvRefreshInterval = refreshIntervalInMs;
                 }
             }
-            this.#refreshTimer = new RefreshTimer(this.#refreshInterval);
+            this.#kvRefreshTimer = new RefreshTimer(this.#kvRefreshInterval);
         }
 
-        this.#keyValueSelectors = getValidKeyValueSelectors(options?.selectors);
+        this.#kvSelectors = getValidKeyValueSelectors(options?.selectors);
 
         // feature flag options
         if (options?.featureFlagOptions?.enabled) {
             // validate feature flag selectors
-            this.#featureFlagSelectors = getValidFeatureFlagSelectors(options.featureFlagOptions.selectors);
+            this.#ffSelectors = getValidFeatureFlagSelectors(options.featureFlagOptions.selectors);
 
             if (options.featureFlagOptions.refresh?.enabled) {
                 const { refreshIntervalInMs } = options.featureFlagOptions.refresh;
@@ -145,11 +145,11 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
                     if (refreshIntervalInMs < MIN_REFRESH_INTERVAL_IN_MS) {
                         throw new Error(`The feature flag refresh interval cannot be less than ${MIN_REFRESH_INTERVAL_IN_MS} milliseconds.`);
                     } else {
-                        this.#featureFlagRefreshInterval = refreshIntervalInMs;
+                        this.#ffRefreshInterval = refreshIntervalInMs;
                     }
                 }
 
-                this.#featureFlagRefreshTimer = new RefreshTimer(this.#featureFlagRefreshInterval);
+                this.#ffRefreshTimer = new RefreshTimer(this.#ffRefreshInterval);
             }
         }
 
@@ -344,7 +344,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
      *                          If false, loads key-value using the key-value selectors. Defaults to false.
      */
     async #loadConfigurationSettings(loadFeatureFlag: boolean = false): Promise<ConfigurationSetting[]> {
-        const selectors = loadFeatureFlag ? this.#featureFlagSelectors : this.#keyValueSelectors;
+        const selectors = loadFeatureFlag ? this.#ffSelectors : this.#kvSelectors;
         const funcToExecute = async (client) => {
             const loadedSettings: ConfigurationSetting[] = [];
             // deep copy selectors to avoid modification if current client fails
@@ -376,9 +376,9 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
             }
 
             if (loadFeatureFlag) {
-                this.#featureFlagSelectors = selectorsToUpdate;
+                this.#ffSelectors = selectorsToUpdate;
             } else {
-                this.#keyValueSelectors = selectorsToUpdate;
+                this.#kvSelectors = selectorsToUpdate;
             }
             return loadedSettings;
         };
@@ -462,14 +462,14 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
      */
     async #refreshKeyValues(): Promise<boolean> {
         // if still within refresh interval/backoff, return
-        if (!this.#refreshTimer.canRefresh()) {
+        if (!this.#kvRefreshTimer.canRefresh()) {
             return Promise.resolve(false);
         }
 
         // try refresh if any of watched settings is changed.
         let needRefresh = false;
         if (this.#watchAll) {
-            needRefresh = await this.#checkConfigurationSettingsChange(this.#keyValueSelectors);
+            needRefresh = await this.#checkConfigurationSettingsChange(this.#kvSelectors);
         }
         for (const sentinel of this.#sentinels.values()) {
             const response = await this.#getConfigurationSetting(sentinel, {
@@ -489,7 +489,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
             await this.#loadSelectedAndWatchedKeyValues();
         }
 
-        this.#refreshTimer.reset();
+        this.#kvRefreshTimer.reset();
         return Promise.resolve(needRefresh);
     }
 
@@ -499,16 +499,16 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
      */
     async #refreshFeatureFlags(): Promise<boolean> {
         // if still within refresh interval/backoff, return
-        if (!this.#featureFlagRefreshTimer.canRefresh()) {
+        if (!this.#ffRefreshTimer.canRefresh()) {
             return Promise.resolve(false);
         }
 
-        const needRefresh = await this.#checkConfigurationSettingsChange(this.#featureFlagSelectors);
+        const needRefresh = await this.#checkConfigurationSettingsChange(this.#ffSelectors);
         if (needRefresh) {
             await this.#loadFeatureFlags();
         }
 
-        this.#featureFlagRefreshTimer.reset();
+        this.#ffRefreshTimer.reset();
         return Promise.resolve(needRefresh);
     }