shopizer-developers
Changes
sm-core/src/main/java/com/salesmanager/core/business/services/reference/country/CountryServiceImpl.java 2(+1 -1)
sm-core/src/main/java/com/salesmanager/core/business/services/reference/language/LanguageServiceImpl.java 2(+1 -1)
sm-core/src/main/java/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.java 4(+2 -2)
sm-core/src/main/java/com/salesmanager/core/business/services/system/ModuleConfigurationServiceImpl.java 2(+1 -1)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.java 4(+2 -2)
Details
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/reference/country/CountryServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/reference/country/CountryServiceImpl.java
index 0cc7075..84d325e 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/reference/country/CountryServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/reference/country/CountryServiceImpl.java
@@ -81,7 +81,7 @@ public class CountryServiceImpl extends SalesManagerEntityServiceImpl<Integer, C
return requestedCountryList;
}
-public static MultiCache<String, List<Country>> getCountriesCache = new MultiCache<>("CountryServiceImpl.getCountries");
+public static MultiCache<String, List<Country>> getCountriesCache = new MultiCache<>("static-multi:CountryServiceImpl.getCountries");
@SuppressWarnings("unchecked")
@Override
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/reference/language/LanguageServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/reference/language/LanguageServiceImpl.java
index 5848f3b..0f5ae92 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/reference/language/LanguageServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/reference/language/LanguageServiceImpl.java
@@ -81,7 +81,7 @@ public class LanguageServiceImpl extends SalesManagerEntityServiceImpl<Integer,
}
-public static GetterCache<List<Language>> getLanguagesCache = new GetterCache<>("LanguageServiceImpl.getLanguages");
+public static GetterCache<List<Language>> getLanguagesCache = new GetterCache<>("static-getter:LanguageServiceImpl.getLanguages");
@Override
@SuppressWarnings("unchecked")
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.java
index dd78199..e7ed9b9 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.java
@@ -62,7 +62,7 @@ public class ZoneServiceImpl extends SalesManagerEntityServiceImpl<Long, Zone> i
}
}
-public static MultiCache<String, List<Zone>> getZonesByCountryCache = new MultiCache<>("ZoneServiceImpl.getZonesByCountry");
+public static MultiCache<String, List<Zone>> getZonesByCountryCache = new MultiCache<>("static-multi:ZoneServiceImpl.getZonesByCountry");
@SuppressWarnings("unchecked")
@Override
@@ -100,7 +100,7 @@ public static MultiCache<String, List<Zone>> getZonesByCountryCache = new MultiC
}
-public static MultiCache<String, Map<String, Zone>> getZonesByLanguageCache = new MultiCache<>("ZoneServiceImpl.getZonesByLanguage");
+public static MultiCache<String, Map<String, Zone>> getZonesByLanguageCache = new MultiCache<>("static-multi:ZoneServiceImpl.getZonesByLanguage");
@Override
@SuppressWarnings("unchecked")
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/system/ModuleConfigurationServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/system/ModuleConfigurationServiceImpl.java
index 44183b9..af5ba30 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/system/ModuleConfigurationServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/system/ModuleConfigurationServiceImpl.java
@@ -54,7 +54,7 @@ public class ModuleConfigurationServiceImpl extends
}
-public static MultiCache<String, List<IntegrationModule>> getIntegrationModulesCache = new MultiCache<>("ModuleConfigurationServiceImpl.getIntegrationModules");
+public static MultiCache<String, List<IntegrationModule>> getIntegrationModulesCache = new MultiCache<>("static-multi:ModuleConfigurationServiceImpl.getIntegrationModules");
@SuppressWarnings({ "unchecked", "rawtypes" })
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java b/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
index 350bc14..f068410 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
@@ -169,7 +169,7 @@ public class ReferenceController {
}
-public static GetterCache<List<String>> getCreditCardYearsCache = new GetterCache<>("ReferenceController.getCreditCardYears");
+public static GetterCache<List<String>> getCreditCardYearsCache = new GetterCache<>("static-getter:ReferenceController.getCreditCardYears");
@SuppressWarnings("unchecked")
@RequestMapping(value={"/shop/reference/creditCardDates.html"}, method=RequestMethod.GET)
@@ -214,7 +214,7 @@ public static GetterCache<List<String>> getCreditCardYearsCache = new GetterCach
}
-public static GetterCache<List<String>> getMonthsOfYearCache = new GetterCache<>("ReferenceController.getMonthsOfYear");
+public static GetterCache<List<String>> getMonthsOfYearCache = new GetterCache<>("static-getter:ReferenceController.getMonthsOfYear");
@SuppressWarnings("unchecked")
@RequestMapping(value={"/shop/reference/monthsOfYear.html"}, method=RequestMethod.GET)
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java b/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
index 7ee9ed6..5fc043a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
@@ -52,7 +52,7 @@ public class AdminFilter extends HandlerInterceptorAdapter {
@Inject
private LanguageUtils languageUtils;
-public static GetterCache<Map<String,Menu>> menuMapCache = new GetterCache<>("AdminFilter.menuMap");
+public static GetterCache<Map<String,Menu>> menuMapCache = new GetterCache<>("static-getter:AdminFilter.menuMap");
public boolean preHandle(
HttpServletRequest request,
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
index 0095147..e9f1e92 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
@@ -370,7 +370,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
}
-public static MultiCache<String, Map<String, Object>> getConfigurationsCache = new MultiCache<>("StoreFilter.getConfigurations");
+public static MultiCache<String, Map<String, Object>> getConfigurationsCache = new MultiCache<>("static-multi:StoreFilter.getConfigurations");
@SuppressWarnings("unchecked")
private void getMerchantConfigurations(MerchantStore store, HttpServletRequest request) throws Exception {
@@ -427,7 +427,7 @@ public static MultiCache<String, Map<String, Object>> getConfigurationsCache = n
}
-public static MultiCache<String, Map<String, List<ContentDescription>>> getContentPageNamesCache = new MultiCache<>("StoreFilter.getContentPageNames");
+public static MultiCache<String, Map<String, List<ContentDescription>>> getContentPageNamesCache = new MultiCache<>("static-multi:StoreFilter.getContentPageNames");
@SuppressWarnings("unchecked")
private void getContentPageNames(MerchantStore store, Language language, HttpServletRequest request) throws Exception {
@@ -506,7 +506,7 @@ public static MultiCache<String, Map<String, List<ContentDescription>>> getConte
}
}
-public static MultiCache<String, Map<String, List<Content>>> getContentObjectsCache = new MultiCache<>("StoreFilter.getContentObjects");
+public static MultiCache<String, Map<String, List<Content>>> getContentObjectsCache = new MultiCache<>("static-multi:StoreFilter.getContentObjects");
@SuppressWarnings({ "unchecked"})
private void getContentObjects(MerchantStore store, Language language, HttpServletRequest request) throws Exception {
@@ -600,7 +600,7 @@ public static MultiCache<String, Map<String, List<Content>>> getContentObjectsCa
}
-public static MultiCache<String, Map<String, List<ReadableCategory>>> getTopCategoriesCache = new MultiCache<>("StoreFilter.getTopCategories");
+public static MultiCache<String, Map<String, List<ReadableCategory>>> getTopCategoriesCache = new MultiCache<>("static-multi:StoreFilter.getTopCategories");
@SuppressWarnings("unchecked")
private void setTopCategories(MerchantStore store, Language language, HttpServletRequest request) throws Exception {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.java
index ffd0ed2..8d7a842 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.java
@@ -133,7 +133,7 @@ public class ShoppingCategoryController {
return this.displayCategory(friendlyUrl,null,model,request,response,locale);
}
-public static MultiCache<String, List<ReadableCategory>> getCategoriesCache = new MultiCache<>("ShoppingCategoryController.getCategories");
+public static MultiCache<String, List<ReadableCategory>> getCategoriesCache = new MultiCache<>("static-multi:ShoppingCategoryController.getCategories");
@SuppressWarnings("unchecked")
private String displayCategory(final String friendlyUrl, final String ref, Model model, HttpServletRequest request, HttpServletResponse response, Locale locale) throws Exception {
@@ -273,7 +273,7 @@ public static MultiCache<String, List<ReadableCategory>> getCategoriesCache = ne
return template.toString();
}
-public static MultiCache<String, List<ReadableManufacturer>> getManufacturersCache = new MultiCache<>("ShoppingCategoryController.getManufacturers");
+public static MultiCache<String, List<ReadableManufacturer>> getManufacturersCache = new MultiCache<>("static-multi:ShoppingCategoryController.getManufacturers");
@SuppressWarnings("unchecked")
private List<ReadableManufacturer> getManufacturersByProductAndCategory(MerchantStore store, Category category, List<Long> subCategoryIds, Language language) throws Exception {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/product/ShopProductController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/product/ShopProductController.java
index 4b3cd5e..7c47a6c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/product/ShopProductController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/product/ShopProductController.java
@@ -128,7 +128,7 @@ public class ShopProductController {
}
-public static MultiCache<String, Map<Long,List<ReadableProduct>>> getRelatedItemsCache = new MultiCache<>("ShopProductController.getRelatedItems");
+public static MultiCache<String, Map<Long,List<ReadableProduct>>> getRelatedItemsCache = new MultiCache<>("static-multi:ShopProductController.getRelatedItems");
public String display(final String reference, final String friendlyUrl, Model model, HttpServletRequest request, HttpServletResponse response, Locale locale) throws Exception {
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductRelationshipTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductRelationshipTag.java
index 5a025da..a1e5e00 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductRelationshipTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductRelationshipTag.java
@@ -67,7 +67,7 @@ public class ShopProductRelationshipTag extends RequestContextAwareTag {
this.groupName = groupName;
}
-public static MultiCache<String, List<ReadableProduct>> getReadableProductsCache = new MultiCache<>("ShopProductRelationShipTag.getReadableProducts");
+public static MultiCache<String, List<ReadableProduct>> getReadableProductsCache = new MultiCache<>("static-multi:ShopProductRelationShipTag.getReadableProducts");
@SuppressWarnings("unchecked")
@Override