shopizer-developers

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 84d325e..f7bdefa 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
@@ -7,7 +7,7 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import br.ufrgs.inf.prosoft.cache.MultiCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -81,7 +81,7 @@ public class CountryServiceImpl extends SalesManagerEntityServiceImpl<Integer, C
 		return requestedCountryList;
 	}
 	
-public static MultiCache<String, List<Country>> getCountriesCache = new MultiCache<>("static-multi:CountryServiceImpl.getCountries");
+public static Caffeine<String, List<Country>> getCountriesCache = new Caffeine<>("static-multi:CountryServiceImpl.getCountries", 1200000);
 	
 	@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 0f5ae92..463bd9d 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
@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import br.ufrgs.inf.prosoft.cache.GetterCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import javax.inject.Inject;
 
@@ -81,7 +81,7 @@ public class LanguageServiceImpl extends SalesManagerEntityServiceImpl<Integer, 
 
 	}
 	
-public static GetterCache<List<Language>> getLanguagesCache = new GetterCache<>("static-getter:LanguageServiceImpl.getLanguages");
+public static CaffeineGetterCache<List<Language>> getLanguagesCache = new CaffeineGetterCache<>("static-getter:LanguageServiceImpl.getLanguages", 1200000);
 	
 	@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 e7ed9b9..892a18d 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
@@ -11,7 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import br.ufrgs.inf.prosoft.cache.MultiCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import com.salesmanager.core.business.constants.Constants;
 import com.salesmanager.core.business.exception.ServiceException;
@@ -62,7 +62,7 @@ public class ZoneServiceImpl extends SalesManagerEntityServiceImpl<Long, Zone> i
 		}
 	}
 
-public static MultiCache<String, List<Zone>> getZonesByCountryCache = new MultiCache<>("static-multi:ZoneServiceImpl.getZonesByCountry");
+public static Caffeine<String, List<Zone>> getZonesByCountryCache = new Caffeine<>("static-multi:ZoneServiceImpl.getZonesByCountry", 1200000);
 	
 	@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<>("static-multi:ZoneServiceImpl.getZonesByLanguage");
+public static Caffeine<String, Map<String, Zone>> getZonesByLanguageCache = new Caffeine<>("static-multi:ZoneServiceImpl.getZonesByLanguage", 1200000);
 
 	@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 af5ba30..18c92b3 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
@@ -7,7 +7,7 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import br.ufrgs.inf.prosoft.cache.MultiCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import org.json.simple.JSONArray;
 import org.json.simple.JSONValue;
@@ -54,7 +54,7 @@ public class ModuleConfigurationServiceImpl extends
 	}
 	
 	
-public static MultiCache<String, List<IntegrationModule>> getIntegrationModulesCache = new MultiCache<>("static-multi:ModuleConfigurationServiceImpl.getIntegrationModules");
+public static Caffeine<String, List<IntegrationModule>> getIntegrationModulesCache = new Caffeine<>("static-multi:ModuleConfigurationServiceImpl.getIntegrationModules", 1200000);
 
 
 	@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 f068410..cdce4d3 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
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import br.ufrgs.inf.prosoft.cache.GetterCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
@@ -169,7 +169,7 @@ public class ReferenceController {
 	}
 	
 
-public static GetterCache<List<String>> getCreditCardYearsCache = new GetterCache<>("static-getter:ReferenceController.getCreditCardYears");
+public static CaffeineGetterCache<List<String>> getCreditCardYearsCache = new CaffeineGetterCache<>("static-getter:ReferenceController.getCreditCardYears", 1200000);
 
 	@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<>("static-getter:ReferenceController.getMonthsOfYear");
+public static CaffeineGetterCache<List<String>> getMonthsOfYearCache = new CaffeineGetterCache<>("static-getter:ReferenceController.getMonthsOfYear", 1200000);
 
 	@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 5fc043a..1e978fc 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
@@ -14,7 +14,7 @@ import com.salesmanager.shop.admin.model.web.Menu;
 import com.salesmanager.shop.constants.Constants;
 import com.salesmanager.shop.utils.LanguageUtils;
 
-import br.ufrgs.inf.prosoft.cache.GetterCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,7 +52,7 @@ public class AdminFilter extends HandlerInterceptorAdapter {
 	@Inject
 	private LanguageUtils languageUtils;
 	
-public static GetterCache<Map<String,Menu>> menuMapCache = new GetterCache<>("static-getter:AdminFilter.menuMap");
+public static CaffeineGetterCache<Map<String,Menu>> menuMapCache = new CaffeineGetterCache<>("static-getter:AdminFilter.menuMap", 1200000);
 
 	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 e9f1e92..c2d83e5 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
@@ -45,7 +45,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
-import br.ufrgs.inf.prosoft.cache.MultiCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
@@ -370,7 +370,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 		   
 	   }
 	   
-public static MultiCache<String, Map<String, Object>> getConfigurationsCache = new MultiCache<>("static-multi:StoreFilter.getConfigurations");
+public static Caffeine<String, Map<String, Object>> getConfigurationsCache = new Caffeine<>("static-multi:StoreFilter.getConfigurations", 1200000);
 
 	   @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<>("static-multi:StoreFilter.getContentPageNames");
+public static Caffeine<String, Map<String, List<ContentDescription>>> getContentPageNamesCache = new Caffeine<>("static-multi:StoreFilter.getContentPageNames", 1200000);
 
 		@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<>("static-multi:StoreFilter.getContentObjects");
+public static Caffeine<String, Map<String, List<Content>>> getContentObjectsCache = new Caffeine<>("static-multi:StoreFilter.getContentObjects", 1200000);
 
 	@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<>("static-multi:StoreFilter.getTopCategories");
+public static Caffeine<String, Map<String, List<ReadableCategory>>> getTopCategoriesCache = new Caffeine<>("static-multi:StoreFilter.getTopCategories", 1200000);
 
 	@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 8d7a842..5035a8e 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
@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import br.ufrgs.inf.prosoft.cache.MultiCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
@@ -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<>("static-multi:ShoppingCategoryController.getCategories");
+public static Caffeine<String, List<ReadableCategory>> getCategoriesCache = new Caffeine<>("static-multi:ShoppingCategoryController.getCategories", 1200000);
 
 	@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<>("static-multi:ShoppingCategoryController.getManufacturers");
+public static Caffeine<String, List<ReadableManufacturer>> getManufacturersCache = new Caffeine<>("static-multi:ShoppingCategoryController.getManufacturers", 1200000);
 
 	@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 7c47a6c..5d3ef0a 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
@@ -43,7 +43,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
-import br.ufrgs.inf.prosoft.cache.MultiCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
@@ -128,7 +128,7 @@ public class ShopProductController {
 	}
 
 
-public static MultiCache<String, Map<Long,List<ReadableProduct>>> getRelatedItemsCache = new MultiCache<>("static-multi:ShopProductController.getRelatedItems");
+public static Caffeine<String, Map<Long,List<ReadableProduct>>> getRelatedItemsCache = new Caffeine<>("static-multi:ShopProductController.getRelatedItems", 1200000);
 
 
 	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 a1e5e00..a891d4f 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
@@ -6,7 +6,7 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 
-import br.ufrgs.inf.prosoft.cache.MultiCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,7 +67,7 @@ public class ShopProductRelationshipTag extends RequestContextAwareTag  {
 		this.groupName = groupName;
 	}
 
-public static MultiCache<String, List<ReadableProduct>> getReadableProductsCache = new MultiCache<>("static-multi:ShopProductRelationShipTag.getReadableProducts");
+public static Caffeine<String, List<ReadableProduct>> getReadableProductsCache = new Caffeine<>("static-multi:ShopProductRelationShipTag.getReadableProducts", 1200000);
 
 	@SuppressWarnings("unchecked")
 	@Override