Update naming variables

1. Update naming convention
2. Use config attribute to get self href

Author: Romy Kusuma

dist/angular-spring-data-rest.js

@@ -67,8 +67,12 @@ angular.module("spring-data-rest").provider("SpringDataRestAdapter", function ()
         },
 
         $get: ["$injector", function ($injector) {
-            // map contain self link as key and a list of linkNames which were already fetched
-            var map = {};
+            /**
+             * Link map which contains the 'self' link as key and the list of already fetched link names as value.
+             * This is used to check that every link on each entity is only fetched once to avoid an infinite recursive loop.
+             * @type {{Object}}
+             */
+            var linkMap = {};
 
             /**
              * Returns the Angular $resource method which is configured with the given parameters.
@@ -252,9 +256,11 @@ angular.module("spring-data-rest").provider("SpringDataRestAdapter", function ()
 
                         // if there are links to fetch, then process and fetch them
                         if (fetchLinkNames != undefined) {
-                            var self = data._links.self.href;
-                            if (!map[self]) {
-                                map[self] = [];
+                            var self = data[config.linksKey][config.linksSelfLinkName][config.linksHrefKey];
+
+                            // add the self link value as key and add an empty map to store all other links which are fetched for this entity
+                            if (!linkMap[self]) {
+                                linkMap[self] = [];
                             }
 
                             // process all links
@@ -264,16 +270,17 @@ angular.module("spring-data-rest").provider("SpringDataRestAdapter", function ()
                                 if (linkName != config.linksSelfLinkName) {
 
                                     // check if:
-                                    // 1. the all link names key is given then fetch the link
-                                    // 2. the given key is equal
-                                    // 3. the given key is inside the array
-                                    if (map[self].indexOf(linkName) < 0 &&
+                                    // 1. the link was not fetched already
+                                    // 2. the all link names key is given then fetch the link
+                                    // 3. the given key is equal
+                                    // 4. the given key is inside the array
+                                    if (linkMap[self].indexOf(linkName) < 0 &&
                                         (fetchLinkNames == config.fetchAllKey ||
                                         (typeof fetchLinkNames === "string" && linkName == fetchLinkNames) ||
                                         (fetchLinkNames instanceof Array && fetchLinkNames.indexOf(linkName) >= 0))) {
                                         promisesArray.push(fetchFunction(getProcessedUrl(data, linkName), linkName,
                                             processedData, fetchLinkNames, recursive));
-                                        map[self].push(linkName);
+                                        linkMap[self].push(linkName);
                                     }
                                 }
                             });
@@ -368,8 +375,14 @@ angular.module("spring-data-rest").provider("SpringDataRestAdapter", function ()
                 }
             };
 
+            // empty the map and
             // return an object with the processData function
-            return {process: processData};
+            return {
+                process: function(promiseOrData, fetchLinkNames, recursive) {
+                    linkMap = {};
+                    return processData(promiseOrData, fetchLinkNames, recursive);
+                }
+            };
         }]
     };
 

dist/angular-spring-data-rest.min.js

@@ -55,8 +55,12 @@ angular.module("spring-data-rest").provider("SpringDataRestAdapter", function ()
         },
 
         $get: ["$injector", function ($injector) {
-            // map contain self link as key and a list of linkNames which were already fetched
-            var map = {};
+            /**
+             * Link map which contains the 'self' link as key and the list of already fetched link names as value.
+             * This is used to check that every link on each entity is only fetched once to avoid an infinite recursive loop.
+             * @type {{Object}}
+             */
+            var linkMap = {};
 
             /**
              * Returns the Angular $resource method which is configured with the given parameters.
@@ -240,9 +244,11 @@ angular.module("spring-data-rest").provider("SpringDataRestAdapter", function ()
 
                         // if there are links to fetch, then process and fetch them
                         if (fetchLinkNames != undefined) {
-                            var self = data._links.self.href;
-                            if (!map[self]) {
-                                map[self] = [];
+                            var self = data[config.linksKey][config.linksSelfLinkName][config.linksHrefKey];
+
+                            // add the self link value as key and add an empty map to store all other links which are fetched for this entity
+                            if (!linkMap[self]) {
+                                linkMap[self] = [];
                             }
 
                             // process all links
@@ -252,16 +258,17 @@ angular.module("spring-data-rest").provider("SpringDataRestAdapter", function ()
                                 if (linkName != config.linksSelfLinkName) {
 
                                     // check if:
-                                    // 1. the all link names key is given then fetch the link
-                                    // 2. the given key is equal
-                                    // 3. the given key is inside the array
-                                    if (map[self].indexOf(linkName) < 0 &&
+                                    // 1. the link was not fetched already
+                                    // 2. the all link names key is given then fetch the link
+                                    // 3. the given key is equal
+                                    // 4. the given key is inside the array
+                                    if (linkMap[self].indexOf(linkName) < 0 &&
                                         (fetchLinkNames == config.fetchAllKey ||
                                         (typeof fetchLinkNames === "string" && linkName == fetchLinkNames) ||
                                         (fetchLinkNames instanceof Array && fetchLinkNames.indexOf(linkName) >= 0))) {
                                         promisesArray.push(fetchFunction(getProcessedUrl(data, linkName), linkName,
                                             processedData, fetchLinkNames, recursive));
-                                        map[self].push(linkName);
+                                        linkMap[self].push(linkName);
                                     }
                                 }
                             });
@@ -360,7 +367,7 @@ angular.module("spring-data-rest").provider("SpringDataRestAdapter", function ()
             // return an object with the processData function
             return {
                 process: function(promiseOrData, fetchLinkNames, recursive) {
-                    map = {};
+                    linkMap = {};
                     return processData(promiseOrData, fetchLinkNames, recursive);
                 }
             };