shopizer-memoizeit
Changes
docker-compose.yml 6(+6 -0)
pom.xml 10(+8 -2)
sm-core/ignored 44(+44 -0)
sm-core/pom.xml 58(+53 -5)
sm-core/src/main/java/com/salesmanager/core/business/services/reference/country/CountryServiceImpl.java 10(+5 -5)
sm-core/src/main/java/com/salesmanager/core/business/services/reference/language/LanguageServiceImpl.java 10(+5 -5)
sm-core/src/main/java/com/salesmanager/core/business/services/reference/zone/ZoneServiceImpl.java 20(+10 -10)
sm-core/src/main/java/com/salesmanager/core/business/services/system/ModuleConfigurationServiceImpl.java 10(+5 -5)
sm-shop/ignored 44(+44 -0)
sm-shop/pom.xml 50(+49 -1)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/CacheController.java 26(+13 -13)
sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.java 64(+32 -32)
Details
docker-compose.yml 6(+6 -0)
diff --git a/docker-compose.yml b/docker-compose.yml
index 29e30b6..586c0e1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,9 +3,15 @@ services:
application:
build: .
container_name: shopizer
+ environment:
+ - TRACER_SERIALISE_INTERNALS=false
+ - TRACER_VERBOSE=true
+ - TRACER_ENABLE=true
+ - TRACER_TRACES=/caching-approaches-comparison/applications/traces/shopizer
volumes:
- application:/application
- /root/.m2:/root/.m2
+ - ../../../:/caching-approaches-comparison
restart: unless-stopped
ports:
- 8080:8080
pom.xml 10(+8 -2)
diff --git a/pom.xml b/pom.xml
index de4c89e..4a997aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,13 @@
</properties>
<dependencies>
-
+
+ <dependency>
+ <groupId>br.ufrgs.inf.prosoft.applicationtracer</groupId>
+ <artifactId>ApplicationTracer</artifactId>
+ <version>1.0</version>
+ </dependency>
+
<!-- <dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
@@ -98,7 +104,7 @@
<!-- https://mvnrepository.com/artifact/net.sf.ehcache/ehcache -->
- <dependency>
+ <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
sm-core/ignored 44(+44 -0)
diff --git a/sm-core/ignored b/sm-core/ignored
new file mode 100644
index 0000000..8dd1ecf
--- /dev/null
+++ b/sm-core/ignored
@@ -0,0 +1,44 @@
+com.fasterxml.jackson.core.
+com.google.code.gson.
+com.google.guava.
+com.google.maps.
+com.googlecode.json-simple.
+com.h2database.
+com.itextpdf.
+com.maxmind.geoip2.
+com.mchange.
+com.paypal.sdk.
+com.stripe.
+com.sun.jersey.
+commons-collections.
+commons-configuration.
+commons-fileupload.
+commons-io.
+commons-logging.
+commons-validator.
+io.searchbox.
+javax.
+javax.el.
+javax.inject.
+javax.mail.
+javax.servlet.
+javax.validation.
+junit.
+log4j.
+mysql.
+net.sf.ehcache.
+org.apache.commons.
+org.apache.httpcomponents.
+org.apache.tiles.
+org.apache.tomcat.embed.
+org.aspectj.
+org.codehaus.jackson.
+org.drools.
+org.elasticsearch.
+org.freemarker.
+org.glassfish.web.
+org.hibernate.
+org.infinispan.
+org.jopendocument.
+org.slf4j.
+org.springframework.
\ No newline at end of file
sm-core/pom.xml 58(+53 -5)
diff --git a/sm-core/pom.xml b/sm-core/pom.xml
index 64cfd49..4e8c652 100644
--- a/sm-core/pom.xml
+++ b/sm-core/pom.xml
@@ -81,11 +81,11 @@
<version>${infinispan.version}</version>
</dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-cachestore-jdbc</artifactId>
+<!-- <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-cachestore-jdbc</artifactId>
<version>${infinispan.version}</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.infinispan</groupId>
@@ -204,7 +204,55 @@
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>aspectj-maven-plugin</artifactId>
+ <version>1.11</version>
+ <configuration>
+ <showWeaveInfo>false</showWeaveInfo>
+ <complianceLevel>1.8</complianceLevel>
+ <source>1.6</source>
+ <target>1.6</target>
+ <Xlint>ignore</Xlint>
+ <encoding>UTF-8</encoding>
+ <verbose>false</verbose>
+ <forceAjcCompile>true</forceAjcCompile>
+ <sources/>
+ <weaveDirectories>
+ <weaveDirectory>${project.build.directory}/classes</weaveDirectory>
+ </weaveDirectories>
+ <aspectLibraries>
+ <aspectLibrary>
+ <groupId>br.ufrgs.inf.prosoft.applicationtracer</groupId>
+ <artifactId>ApplicationTracer</artifactId>
+ </aspectLibrary>
+ </aspectLibraries>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjtools</artifactId>
+ <version>1.9.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
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 b31af65..38727be 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
@@ -16,7 +16,7 @@ import org.springframework.util.CollectionUtils;
import com.salesmanager.core.business.exception.ServiceException;
import com.salesmanager.core.business.repositories.reference.country.CountryRepository;
import com.salesmanager.core.business.services.common.generic.SalesManagerEntityServiceImpl;
-import com.salesmanager.core.business.utils.CacheUtils;
+//import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.model.reference.country.Country;
import com.salesmanager.core.model.reference.country.CountryDescription;
import com.salesmanager.core.model.reference.language.Language;
@@ -29,8 +29,8 @@ public class CountryServiceImpl extends SalesManagerEntityServiceImpl<Integer, C
private CountryRepository countryRepository;
- @Inject
- private CacheUtils cache;
+// @Inject
+// private CacheUtils cache;
@Inject
@@ -87,7 +87,7 @@ public class CountryServiceImpl extends SalesManagerEntityServiceImpl<Integer, C
List<Country> countries = null;
try {
- countries = (List<Country>) cache.getFromCache("COUNTRIES_" + language.getCode());
+// countries = (List<Country>) cache.getFromCache("COUNTRIES_" + language.getCode());
@@ -103,7 +103,7 @@ public class CountryServiceImpl extends SalesManagerEntityServiceImpl<Integer, C
}
- cache.putInCache(countries, "COUNTRIES_" + language.getCode());
+// cache.putInCache(countries, "COUNTRIES_" + language.getCode());
}
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 8b72793..074b759 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
@@ -15,7 +15,7 @@ import com.salesmanager.core.business.constants.Constants;
import com.salesmanager.core.business.exception.ServiceException;
import com.salesmanager.core.business.repositories.reference.language.LanguageRepository;
import com.salesmanager.core.business.services.common.generic.SalesManagerEntityServiceImpl;
-import com.salesmanager.core.business.utils.CacheUtils;
+//import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.model.reference.language.Language;
/**
@@ -30,8 +30,8 @@ public class LanguageServiceImpl extends SalesManagerEntityServiceImpl<Integer,
private static final Logger LOGGER = LoggerFactory.getLogger(LanguageServiceImpl.class);
- @Inject
- private CacheUtils cache;
+// @Inject
+// private CacheUtils cache;
private LanguageRepository languageRepository;
@@ -88,10 +88,10 @@ public class LanguageServiceImpl extends SalesManagerEntityServiceImpl<Integer,
List<Language> langs = null;
try {
- langs = (List<Language>) cache.getFromCache("LANGUAGES");
+// langs = (List<Language>) cache.getFromCache("LANGUAGES");
if(langs==null) {
langs = this.list();
- cache.putInCache(langs, "LANGUAGES");
+// cache.putInCache(langs, "LANGUAGES");
}
} catch (Exception e) {
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 1d16dd1..9a94591 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
@@ -15,7 +15,7 @@ import com.salesmanager.core.business.constants.Constants;
import com.salesmanager.core.business.exception.ServiceException;
import com.salesmanager.core.business.repositories.reference.zone.ZoneRepository;
import com.salesmanager.core.business.services.common.generic.SalesManagerEntityServiceImpl;
-import com.salesmanager.core.business.utils.CacheUtils;
+//import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.model.reference.country.Country;
import com.salesmanager.core.model.reference.language.Language;
import com.salesmanager.core.model.reference.zone.Zone;
@@ -25,12 +25,12 @@ import com.salesmanager.core.model.reference.zone.ZoneDescription;
public class ZoneServiceImpl extends SalesManagerEntityServiceImpl<Long, Zone> implements
ZoneService {
- private final static String ZONE_CACHE_PREFIX = "ZONES_";
+// private final static String ZONE_CACHE_PREFIX = "ZONES_";
private ZoneRepository zoneRepository;
- @Inject
- private CacheUtils cache;
+// @Inject
+// private CacheUtils cache;
private static final Logger LOGGER = LoggerFactory.getLogger(ZoneServiceImpl.class);
@@ -67,9 +67,9 @@ public class ZoneServiceImpl extends SalesManagerEntityServiceImpl<Long, Zone> i
List<Zone> zones = null;
try {
- String cacheKey = ZONE_CACHE_PREFIX + country.getIsoCode() + Constants.UNDERSCORE + language.getCode();
+// String cacheKey = ZONE_CACHE_PREFIX + country.getIsoCode() + Constants.UNDERSCORE + language.getCode();
- zones = (List<Zone>) cache.getFromCache(cacheKey);
+// zones = (List<Zone>) cache.getFromCache(cacheKey);
@@ -83,7 +83,7 @@ public class ZoneServiceImpl extends SalesManagerEntityServiceImpl<Long, Zone> i
zone.setName(description.getName());
}
- cache.putInCache(zones, cacheKey);
+// cache.putInCache(zones, cacheKey);
}
} catch (Exception e) {
@@ -101,9 +101,9 @@ public class ZoneServiceImpl extends SalesManagerEntityServiceImpl<Long, Zone> i
Map<String, Zone> zones = null;
try {
- String cacheKey = ZONE_CACHE_PREFIX + language.getCode();
+// String cacheKey = ZONE_CACHE_PREFIX + language.getCode();
- zones = (Map<String, Zone>) cache.getFromCache(cacheKey);
+// zones = (Map<String, Zone>) cache.getFromCache(cacheKey);
@@ -118,7 +118,7 @@ public class ZoneServiceImpl extends SalesManagerEntityServiceImpl<Long, Zone> i
zones.put(zone.getCode(), zone);
}
- cache.putInCache(zones, cacheKey);
+// cache.putInCache(zones, cacheKey);
}
} catch (Exception e) {
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 2334f34..7e3f0a2 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
@@ -18,7 +18,7 @@ import com.salesmanager.core.business.exception.ServiceException;
import com.salesmanager.core.business.repositories.system.ModuleConfigurationRepository;
import com.salesmanager.core.business.services.common.generic.SalesManagerEntityServiceImpl;
import com.salesmanager.core.business.services.reference.loader.IntegrationModulesLoader;
-import com.salesmanager.core.business.utils.CacheUtils;
+//import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.model.system.IntegrationModule;
import com.salesmanager.core.model.system.ModuleConfig;
@@ -36,8 +36,8 @@ public class ModuleConfigurationServiceImpl extends
private ModuleConfigurationRepository moduleConfigurationRepository;
- @Inject
- private CacheUtils cache;
+// @Inject
+// private CacheUtils cache;
@Inject
public ModuleConfigurationServiceImpl(
@@ -61,7 +61,7 @@ public class ModuleConfigurationServiceImpl extends
try {
//CacheUtils cacheUtils = CacheUtils.getInstance();
- modules = (List<IntegrationModule>) cache.getFromCache("INTEGRATION_M)" + module);
+// modules = (List<IntegrationModule>) cache.getFromCache("INTEGRATION_M)" + module);
if(modules==null) {
modules = moduleConfigurationRepository.findByModule(module);
//set json objects
@@ -131,7 +131,7 @@ public class ModuleConfigurationServiceImpl extends
}
- cache.putInCache(modules, "INTEGRATION_M)" + module);
+// cache.putInCache(modules, "INTEGRATION_M)" + module);
}
} catch (Exception e) {
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/utils/CacheUtils.java b/sm-core/src/main/java/com/salesmanager/core/business/utils/CacheUtils.java
index 8b48e3d..131f5f3 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/utils/CacheUtils.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/utils/CacheUtils.java
@@ -8,104 +8,104 @@ import javax.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.cache.Cache;
-import org.springframework.cache.Cache.ValueWrapper;
+// import org.springframework.cache.Cache;
+// import org.springframework.cache.Cache.ValueWrapper;
import org.springframework.stereotype.Component;
import com.salesmanager.core.model.merchant.MerchantStore;
-@Component("cache")
+// @Component("cache")
public class CacheUtils {
- @Inject
- @Qualifier("serviceCache")
- private Cache cache;
+ // @Inject
+ // @Qualifier("serviceCache")
+ // private Cache cache;
- public final static String REFERENCE_CACHE = "REF";
+ // public final static String REFERENCE_CACHE = "REF";
- private static final Logger LOGGER = LoggerFactory.getLogger(CacheUtils.class);
+ // private static final Logger LOGGER = LoggerFactory.getLogger(CacheUtils.class);
- private final static String KEY_DELIMITER = "_";
+ // private final static String KEY_DELIMITER = "_";
- public void putInCache(Object object, String keyName) throws Exception {
+ // public void putInCache(Object object, String keyName) throws Exception {
- cache.put(keyName, object);
+ // cache.put(keyName, object);
- }
+ // }
- public Object getFromCache(String keyName) throws Exception {
+ // public Object getFromCache(String keyName) throws Exception {
- ValueWrapper vw = cache.get(keyName);
- if(vw!=null) {
- return vw.get();
- }
+ // ValueWrapper vw = cache.get(keyName);
+ // if(vw!=null) {
+ // return vw.get();
+ // }
- return null;
+ // return null;
- }
+ // }
- public List<String> getCacheKeys(MerchantStore store) throws Exception {
+ // public List<String> getCacheKeys(MerchantStore store) throws Exception {
- net.sf.ehcache.Cache cacheImpl = (net.sf.ehcache.Cache) cache.getNativeCache();
- List<String> returnKeys = new ArrayList<String>();
- for (Object key: cacheImpl.getKeys()) {
+ // net.sf.ehcache.Cache cacheImpl = (net.sf.ehcache.Cache) cache.getNativeCache();
+ // List<String> returnKeys = new ArrayList<String>();
+ // for (Object key: cacheImpl.getKeys()) {
- try {
- String sKey = (String)key;
+ // try {
+ // String sKey = (String)key;
- // a key should be <storeId>_<rest of the key>
- int delimiterPosition = sKey.indexOf(KEY_DELIMITER);
+ // // a key should be <storeId>_<rest of the key>
+ // int delimiterPosition = sKey.indexOf(KEY_DELIMITER);
- if(delimiterPosition>0 && Character.isDigit(sKey.charAt(0))) {
+ // if(delimiterPosition>0 && Character.isDigit(sKey.charAt(0))) {
- String keyRemaining = sKey.substring(delimiterPosition+1);
- returnKeys.add(keyRemaining);
+ // String keyRemaining = sKey.substring(delimiterPosition+1);
+ // returnKeys.add(keyRemaining);
- }
+ // }
- } catch (Exception e) {
- LOGGER.equals("key " + key + " cannot be converted to a String or parsed");
- }
- }
+ // } catch (Exception e) {
+ // LOGGER.equals("key " + key + " cannot be converted to a String or parsed");
+ // }
+ // }
- return returnKeys;
- }
+ // return returnKeys;
+ // }
- public void shutDownCache() throws Exception {
+ // public void shutDownCache() throws Exception {
- }
+ // }
- public void removeFromCache(String keyName) throws Exception {
- cache.evict(keyName);
- }
+ // public void removeFromCache(String keyName) throws Exception {
+ // cache.evict(keyName);
+ // }
- public void removeAllFromCache(MerchantStore store) throws Exception {
- net.sf.ehcache.Cache cacheImpl = (net.sf.ehcache.Cache) cache.getNativeCache();
- for (Object key: cacheImpl.getKeys()) {
- try {
- String sKey = (String)key;
+ // public void removeAllFromCache(MerchantStore store) throws Exception {
+ // net.sf.ehcache.Cache cacheImpl = (net.sf.ehcache.Cache) cache.getNativeCache();
+ // for (Object key: cacheImpl.getKeys()) {
+ // try {
+ // String sKey = (String)key;
- // a key should be <storeId>_<rest of the key>
- int delimiterPosition = sKey.indexOf(KEY_DELIMITER);
+ // // a key should be <storeId>_<rest of the key>
+ // int delimiterPosition = sKey.indexOf(KEY_DELIMITER);
- if(delimiterPosition>0 && Character.isDigit(sKey.charAt(0))) {
+ // if(delimiterPosition>0 && Character.isDigit(sKey.charAt(0))) {
- cache.evict(key);
+ // cache.evict(key);
- }
+ // }
- } catch (Exception e) {
- LOGGER.equals("key " + key + " cannot be converted to a String or parsed");
- }
- }
- }
+ // } catch (Exception e) {
+ // LOGGER.equals("key " + key + " cannot be converted to a String or parsed");
+ // }
+ // }
+ // }
diff --git a/sm-core/src/main/resources/spring/ehcache.xml b/sm-core/src/main/resources/spring/ehcache.xml
index 4a78203..11c1060 100644
--- a/sm-core/src/main/resources/spring/ehcache.xml
+++ b/sm-core/src/main/resources/spring/ehcache.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!-- <?xml version="1.0" encoding="UTF-8"?>
<ehcache name="com.shopizer.core.cache"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd">
@@ -24,4 +24,4 @@
timeToLiveSeconds="1200"
memoryStoreEvictionPolicy="LFU" />
-</ehcache>
\ No newline at end of file
+</ehcache> -->
\ No newline at end of file
diff --git a/sm-core/src/main/resources/spring/shopizer-core-config.xml b/sm-core/src/main/resources/spring/shopizer-core-config.xml
index 91ceac8..c4514a4 100644
--- a/sm-core/src/main/resources/spring/shopizer-core-config.xml
+++ b/sm-core/src/main/resources/spring/shopizer-core-config.xml
@@ -42,8 +42,8 @@
<beans:entry key="hibernate.default_schema" value="${db.schema}" />
<beans:entry key="hibernate.hbm2ddl.auto" value="${hibernate.hbm2ddl.auto}" />
<beans:entry key="hibernate.show_sql" value="true" />
- <beans:entry key="hibernate.cache.provider_class" value="org.hibernate.cache.EhCacheProvider" />
- <beans:entry key="hibernate.cache.use_second_level_cache" value="true" />
+ <!-- <beans:entry key="hibernate.cache.provider_class" value="org.hibernate.cache.EhCacheProvider" /> -->
+ <beans:entry key="hibernate.cache.use_second_level_cache" value="false" />
<!-- Uncomment the following 2 lines to generate shopizer sql schema when the application is built. Remove the schema.sql file once generated, otherwise it will try to create it twice in the test database (table already exist... -->
<!--
diff --git a/sm-core/src/main/resources/spring/shopizer-core-context.xml b/sm-core/src/main/resources/spring/shopizer-core-context.xml
index 6d54889..14d81ae 100644
--- a/sm-core/src/main/resources/spring/shopizer-core-context.xml
+++ b/sm-core/src/main/resources/spring/shopizer-core-context.xml
@@ -25,7 +25,7 @@
<!-- datasource -->
<beans:import resource="classpath:/spring/datasource-c3p0.xml" />
<!-- cache -->
- <beans:import resource="classpath:/spring/shopizer-core-ehcache.xml" />
+ <!-- <beans:import resource="classpath:/spring/shopizer-core-ehcache.xml" /> -->
<!-- DB, TX and properties -->
<beans:import resource="classpath:/spring/shopizer-core-config.xml" />
<!-- modules -->
diff --git a/sm-core/src/main/resources/spring/shopizer-core-ehcache.xml b/sm-core/src/main/resources/spring/shopizer-core-ehcache.xml
index cc1fce0..c59c379 100644
--- a/sm-core/src/main/resources/spring/shopizer-core-ehcache.xml
+++ b/sm-core/src/main/resources/spring/shopizer-core-ehcache.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!-- <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:task="http://www.springframework.org/schema/task"
xmlns:util="http://www.springframework.org/schema/util"
@@ -28,4 +28,4 @@
<constructor-arg value="com.shopizer.OBJECT_CACHE" />
</bean>
-</beans>
\ No newline at end of file
+</beans> -->
\ No newline at end of file
diff --git a/sm-core/src/test/java/com/salesmanager/test/utils/UtilsTestCase.java b/sm-core/src/test/java/com/salesmanager/test/utils/UtilsTestCase.java
index e3b584f..7e9c25c 100644
--- a/sm-core/src/test/java/com/salesmanager/test/utils/UtilsTestCase.java
+++ b/sm-core/src/test/java/com/salesmanager/test/utils/UtilsTestCase.java
@@ -17,7 +17,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.salesmanager.core.business.services.reference.country.CountryService;
import com.salesmanager.core.business.services.reference.currency.CurrencyService;
-import com.salesmanager.core.business.utils.CacheUtils;
+// import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.model.common.Address;
import com.salesmanager.core.model.reference.currency.Currency;
import com.salesmanager.core.modules.utils.Encryption;
@@ -40,8 +40,8 @@ public class UtilsTestCase {
@Inject
private Encryption encryption;
- @Inject
- private CacheUtils cache;
+ // @Inject
+ // private CacheUtils cache;
@Inject
private GeoLocation geoLoaction;
@@ -58,12 +58,12 @@ public class UtilsTestCase {
List countries = countryService.list();
//CacheUtils cache = CacheUtils.getInstance();
- cache.putInCache(countries, "COUNTRIES");
+ // cache.putInCache(countries, "COUNTRIES");
- @SuppressWarnings("rawtypes")
- List objects = (List) cache.getFromCache("COUNTRIES");
+ // @SuppressWarnings("rawtypes")
+ // List objects = (List) cache.getFromCache("COUNTRIES");
- Assert.assertNotNull(objects);
+ // Assert.assertNotNull(objects);
}
diff --git a/sm-core-model/src/main/java/com/salesmanager/core/model/reference/country/Country.java b/sm-core-model/src/main/java/com/salesmanager/core/model/reference/country/Country.java
index 0ed55a8..902dc3a 100644
--- a/sm-core-model/src/main/java/com/salesmanager/core/model/reference/country/Country.java
+++ b/sm-core-model/src/main/java/com/salesmanager/core/model/reference/country/Country.java
@@ -3,7 +3,7 @@ package com.salesmanager.core.model.reference.country;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.Cacheable;
+// import javax.persistence.Cacheable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -24,7 +24,7 @@ import com.salesmanager.core.model.reference.zone.Zone;
@Entity
@Table(name = "COUNTRY", schema=SchemaConstant.SALESMANAGER_SCHEMA)
-@Cacheable
+// @Cacheable
public class Country extends SalesManagerEntity<Integer, Country> {
private static final long serialVersionUID = -7388011537255588035L;
diff --git a/sm-core-model/src/main/java/com/salesmanager/core/model/reference/currency/Currency.java b/sm-core-model/src/main/java/com/salesmanager/core/model/reference/currency/Currency.java
index 805c892..d7d9bd2 100644
--- a/sm-core-model/src/main/java/com/salesmanager/core/model/reference/currency/Currency.java
+++ b/sm-core-model/src/main/java/com/salesmanager/core/model/reference/currency/Currency.java
@@ -2,7 +2,7 @@ package com.salesmanager.core.model.reference.currency;
import java.io.Serializable;
-import javax.persistence.Cacheable;
+// import javax.persistence.Cacheable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -16,7 +16,7 @@ import com.salesmanager.core.model.generic.SalesManagerEntity;
@Entity
@Table(name = "CURRENCY", schema = SchemaConstant.SALESMANAGER_SCHEMA)
-@Cacheable
+// @Cacheable
public class Currency extends SalesManagerEntity<Long, Currency> implements Serializable {
private static final long serialVersionUID = -999926410367685145L;
diff --git a/sm-core-model/src/main/java/com/salesmanager/core/model/reference/language/Language.java b/sm-core-model/src/main/java/com/salesmanager/core/model/reference/language/Language.java
index 920437b..fcc7611 100644
--- a/sm-core-model/src/main/java/com/salesmanager/core/model/reference/language/Language.java
+++ b/sm-core-model/src/main/java/com/salesmanager/core/model/reference/language/Language.java
@@ -3,7 +3,7 @@ package com.salesmanager.core.model.reference.language;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.Cacheable;
+// import javax.persistence.Cacheable;
import javax.persistence.Column;
import javax.persistence.Embedded;
import javax.persistence.Entity;
@@ -26,7 +26,7 @@ import com.salesmanager.core.model.merchant.MerchantStore;
@Entity
@EntityListeners(value = AuditListener.class)
@Table(name = "LANGUAGE", schema=SchemaConstant.SALESMANAGER_SCHEMA)
-@Cacheable
+// @Cacheable
public class Language extends SalesManagerEntity<Integer, Language> implements Auditable {
private static final long serialVersionUID = -7676627812941330669L;
sm-shop/ignored 44(+44 -0)
diff --git a/sm-shop/ignored b/sm-shop/ignored
new file mode 100644
index 0000000..8dd1ecf
--- /dev/null
+++ b/sm-shop/ignored
@@ -0,0 +1,44 @@
+com.fasterxml.jackson.core.
+com.google.code.gson.
+com.google.guava.
+com.google.maps.
+com.googlecode.json-simple.
+com.h2database.
+com.itextpdf.
+com.maxmind.geoip2.
+com.mchange.
+com.paypal.sdk.
+com.stripe.
+com.sun.jersey.
+commons-collections.
+commons-configuration.
+commons-fileupload.
+commons-io.
+commons-logging.
+commons-validator.
+io.searchbox.
+javax.
+javax.el.
+javax.inject.
+javax.mail.
+javax.servlet.
+javax.validation.
+junit.
+log4j.
+mysql.
+net.sf.ehcache.
+org.apache.commons.
+org.apache.httpcomponents.
+org.apache.tiles.
+org.apache.tomcat.embed.
+org.aspectj.
+org.codehaus.jackson.
+org.drools.
+org.elasticsearch.
+org.freemarker.
+org.glassfish.web.
+org.hibernate.
+org.infinispan.
+org.jopendocument.
+org.slf4j.
+org.springframework.
\ No newline at end of file
sm-shop/pom.xml 50(+49 -1)
diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
index cdca6be..9eb8ac0 100644
--- a/sm-shop/pom.xml
+++ b/sm-shop/pom.xml
@@ -161,7 +161,55 @@
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>aspectj-maven-plugin</artifactId>
+ <version>1.11</version>
+ <configuration>
+ <showWeaveInfo>false</showWeaveInfo>
+ <complianceLevel>1.8</complianceLevel>
+ <source>1.6</source>
+ <target>1.6</target>
+ <Xlint>ignore</Xlint>
+ <encoding>UTF-8</encoding>
+ <verbose>false</verbose>
+ <forceAjcCompile>true</forceAjcCompile>
+ <sources/>
+ <weaveDirectories>
+ <weaveDirectory>${project.build.directory}/classes</weaveDirectory>
+ </weaveDirectories>
+ <aspectLibraries>
+ <aspectLibrary>
+ <groupId>br.ufrgs.inf.prosoft.applicationtracer</groupId>
+ <artifactId>ApplicationTracer</artifactId>
+ </aspectLibrary>
+ </aspectLibraries>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjtools</artifactId>
+ <version>1.9.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/CacheController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/CacheController.java
index 4100609..3c43c76 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/CacheController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/CacheController.java
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
-import com.salesmanager.core.business.utils.CacheUtils;
+// import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.business.utils.ajax.AjaxResponse;
import com.salesmanager.core.model.merchant.MerchantStore;
import com.salesmanager.shop.admin.controller.ControllerConstants;
@@ -36,8 +36,8 @@ public class CacheController {
private static final Logger LOGGER = LoggerFactory.getLogger(CacheController.class);
- @Inject
- private CacheUtils cache;
+ // @Inject
+ // private CacheUtils cache;
@@ -50,9 +50,9 @@ public class CacheController {
MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
//get cache keys
- List<String> cacheKeysList = cache.getCacheKeys(store);
+ // List<String> cacheKeysList = cache.getCacheKeys(store);
- model.addAttribute("keys", cacheKeysList);
+ // model.addAttribute("keys", cacheKeysList);
return ControllerConstants.Tiles.Configuration.cache;
@@ -62,7 +62,7 @@ public class CacheController {
@PreAuthorize("hasRole('AUTH')")
@RequestMapping(value="/admin/cache/clear.html", method=RequestMethod.POST)
public @ResponseBody ResponseEntity<String> clearCache(HttpServletRequest request, HttpServletResponse response) {
- String cacheKey = request.getParameter("cacheKey");
+ // String cacheKey = request.getParameter("cacheKey");
AjaxResponse resp = new AjaxResponse();
@@ -70,14 +70,14 @@ public class CacheController {
MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
- StringBuilder key = new StringBuilder();
- key.append(store.getId()).append("_").append(cacheKey);
+ // StringBuilder key = new StringBuilder();
+ // key.append(store.getId()).append("_").append(cacheKey);
- if(cacheKey!=null) {
- cache.removeFromCache(key.toString());
- } else {
- cache.removeAllFromCache(store);
- }
+ // if(cacheKey!=null) {
+ // cache.removeFromCache(key.toString());
+ // } else {
+ // cache.removeAllFromCache(store);
+ // }
resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/constants/Constants.java b/sm-shop/src/main/java/com/salesmanager/shop/constants/Constants.java
index 14b12a9..234a80c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/constants/Constants.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/constants/Constants.java
@@ -77,11 +77,11 @@ public class Constants {
public final static String CONTENT_CACHE_KEY = "CONTENT";
public final static String CONTENT_PAGE_CACHE_KEY = "CONTENT_PAGE";
public final static String CATEGORIES_CACHE_KEY = "CATALOG_CATEGORIES";
- public final static String PRODUCTS_GROUP_CACHE_KEY = "CATALOG_GROUP";
- public final static String SUBCATEGORIES_CACHE_KEY = "CATALOG_SUBCATEGORIES";
- public final static String RELATEDITEMS_CACHE_KEY = "CATALOG_RELATEDITEMS";
- public final static String MANUFACTURERS_BY_PRODUCTS_CACHE_KEY = "CATALOG_BRANDS_BY_PRODUCTS";
- public final static String CONFIG_CACHE_KEY = "CONFIG";
+ // public final static String PRODUCTS_GROUP_CACHE_KEY = "CATALOG_GROUP";
+ // public final static String SUBCATEGORIES_CACHE_KEY = "CATALOG_SUBCATEGORIES";
+ // public final static String RELATEDITEMS_CACHE_KEY = "CATALOG_RELATEDITEMS";
+ // public final static String MANUFACTURERS_BY_PRODUCTS_CACHE_KEY = "CATALOG_BRANDS_BY_PRODUCTS";
+ // public final static String CONFIG_CACHE_KEY = "CONFIG";
public final static String REQUEST_CONTENT_OBJECTS = "CONTENT";
public final static String REQUEST_CONTENT_PAGE_OBJECTS = "CONTENT_PAGE";
@@ -107,8 +107,8 @@ public class Constants {
public final static String START = "start";
public final static String MAX = "max";
- public final static String CREDIT_CARD_YEARS_CACHE_KEY = "CREDIT_CARD_YEARS_CACHE_KEY";
- public final static String MONTHS_OF_YEAR_CACHE_KEY = "MONTHS_OF_YEAR_CACHE_KEY";
+ // public final static String CREDIT_CARD_YEARS_CACHE_KEY = "CREDIT_CARD_YEARS_CACHE_KEY";
+ // public final static String MONTHS_OF_YEAR_CACHE_KEY = "MONTHS_OF_YEAR_CACHE_KEY";
public final static String INIT_TRANSACTION_KEY = "init_transaction";
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 55aabdd..794d9ab 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
@@ -5,7 +5,7 @@ import com.salesmanager.core.business.exception.ServiceException;
import com.salesmanager.core.business.services.reference.country.CountryService;
import com.salesmanager.core.business.services.reference.language.LanguageService;
import com.salesmanager.core.business.services.reference.zone.ZoneService;
-import com.salesmanager.core.business.utils.CacheUtils;
+//import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.business.utils.ajax.AjaxResponse;
import com.salesmanager.core.model.reference.country.Country;
import com.salesmanager.core.model.reference.language.Language;
@@ -51,8 +51,8 @@ public class ReferenceController {
@Inject
private LanguageService languageService;
- @Inject
- private CacheUtils cache;
+// @Inject
+// private CacheUtils cache;
@Inject
private LanguageUtils languageUtils;
@@ -176,7 +176,7 @@ public class ReferenceController {
try {
- years = (List<String>)cache.getFromCache(Constants.CREDIT_CARD_YEARS_CACHE_KEY);
+// years = (List<String>)cache.getFromCache(Constants.CREDIT_CARD_YEARS_CACHE_KEY);
if(years==null) {
@@ -191,7 +191,7 @@ public class ReferenceController {
}
//up to year + 10
- cache.putInCache(years, Constants.CREDIT_CARD_YEARS_CACHE_KEY);
+// cache.putInCache(years, Constants.CREDIT_CARD_YEARS_CACHE_KEY);
}
@@ -220,7 +220,7 @@ public class ReferenceController {
String serialized = null;
try {
- days = (List<String>)cache.getFromCache(Constants.MONTHS_OF_YEAR_CACHE_KEY);
+// days = (List<String>)cache.getFromCache(Constants.MONTHS_OF_YEAR_CACHE_KEY);
if(days==null) {
days = new ArrayList<String>();
@@ -228,7 +228,7 @@ public class ReferenceController {
days.add(String.format("%02d", i));
}
- cache.putInCache(days, Constants.MONTHS_OF_YEAR_CACHE_KEY);
+// cache.putInCache(days, Constants.MONTHS_OF_YEAR_CACHE_KEY);
}
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 affb7ae..cbb5aca 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
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.salesmanager.core.business.services.merchant.MerchantStoreService;
import com.salesmanager.core.business.services.reference.language.LanguageService;
import com.salesmanager.core.business.services.user.UserService;
-import com.salesmanager.core.business.utils.CacheUtils;
+//import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.model.merchant.MerchantStore;
import com.salesmanager.core.model.reference.language.Language;
import com.salesmanager.core.model.user.User;
@@ -45,8 +45,8 @@ public class AdminFilter extends HandlerInterceptorAdapter {
@Inject
private LanguageService languageService;
- @Inject
- private CacheUtils cache;
+// @Inject
+// private CacheUtils cache;
@Inject
private LanguageUtils languageUtils;
@@ -57,8 +57,9 @@ public class AdminFilter extends HandlerInterceptorAdapter {
Object handler) throws Exception {
request.setCharacterEncoding("UTF-8");
- @SuppressWarnings("unchecked")
- Map<String,Menu> menus = (Map<String,Menu>) cache.getFromCache("MENUMAP");
+// @SuppressWarnings("unchecked")
+ // Map<String,Menu> menus = (Map<String,Menu>) cache.getFromCache("MENUMAP");
+ Map<String,Menu> menus = null;
User user = (User)request.getSession().getAttribute(Constants.ADMIN_USER);
@@ -152,7 +153,7 @@ public class AdminFilter extends HandlerInterceptorAdapter {
menus.put(m.getCode(),m);
}
- cache.putInCache(menus,"MENUMAP");
+// cache.putInCache(menus,"MENUMAP");
} catch (JsonParseException e) {
LOGGER.error("Error while creating menu", e);
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 7d6ef05..a26158d 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
@@ -8,7 +8,7 @@ import com.salesmanager.core.business.services.customer.CustomerService;
import com.salesmanager.core.business.services.merchant.MerchantStoreService;
import com.salesmanager.core.business.services.reference.language.LanguageService;
import com.salesmanager.core.business.services.system.MerchantConfigurationService;
-import com.salesmanager.core.business.utils.CacheUtils;
+// import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.business.utils.CoreConfiguration;
import com.salesmanager.core.model.catalog.category.Category;
import com.salesmanager.core.model.catalog.category.CategoryDescription;
@@ -35,7 +35,7 @@ import com.salesmanager.shop.store.controller.category.facade.CategoryFacade;
import com.salesmanager.shop.utils.GeoLocationUtils;
import com.salesmanager.shop.utils.LabelUtils;
import com.salesmanager.shop.utils.LanguageUtils;
-import com.salesmanager.shop.utils.WebApplicationCacheUtils;
+// import com.salesmanager.shop.utils.WebApplicationCacheUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -89,11 +89,11 @@ public class StoreFilter extends HandlerInterceptorAdapter {
@Inject
private LanguageUtils languageUtils;
- @Inject
- private CacheUtils cache;
+ // @Inject
+ // private CacheUtils cache;
- @Inject
- private WebApplicationCacheUtils webApplicationCache;
+ // @Inject
+ // private WebApplicationCacheUtils webApplicationCache;
@Inject
private CategoryFacade categoryFacade;
@@ -373,24 +373,24 @@ public class StoreFilter extends HandlerInterceptorAdapter {
- StringBuilder configKey = new StringBuilder();
- configKey
- .append(store.getId())
- .append("_")
- .append(Constants.CONFIG_CACHE_KEY);
+ // StringBuilder configKey = new StringBuilder();
+ // configKey
+ // .append(store.getId())
+ // .append("_")
+ // .append(Constants.CONFIG_CACHE_KEY);
- StringBuilder configKeyMissed = new StringBuilder();
- configKeyMissed
- .append(configKey.toString())
- .append(Constants.MISSED_CACHE_KEY);
+ // StringBuilder configKeyMissed = new StringBuilder();
+ // configKeyMissed
+ // .append(configKey.toString())
+ // .append(Constants.MISSED_CACHE_KEY);
Map<String, Object> configs = null;
if(store.isUseCache()) {
//get from the cache
- configs = (Map<String, Object>) cache.getFromCache(configKey.toString());
+ // configs = (Map<String, Object>) cache.getFromCache(configKey.toString());
if(configs==null) {
//get from missed cache
//Boolean missedContent = (Boolean)cache.getFromCache(configKeyMissed.toString());
@@ -400,7 +400,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
//put in cache
if(configs!=null) {
- cache.putInCache(configs, configKey.toString());
+ // cache.putInCache(configs, configKey.toString());
} else {
//put in missed cache
//cache.putInCache(new Boolean(true), configKeyMissed.toString());
@@ -457,7 +457,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
if(store.isUseCache()) {
//get from the cache
- contents = (Map<String, List<ContentDescription>>) cache.getFromCache(contentKey.toString());
+ // contents = (Map<String, List<ContentDescription>>) cache.getFromCache(contentKey.toString());
if(contents==null) {
@@ -471,7 +471,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
if(contents!=null) {
//put in cache
- cache.putInCache(contents, contentKey.toString());
+ // cache.putInCache(contents, contentKey.toString());
} else {
//put in missed cache
@@ -511,25 +511,25 @@ public class StoreFilter extends HandlerInterceptorAdapter {
* The value is a List of Content object
*/
- StringBuilder contentKey = new StringBuilder();
- contentKey
- .append(store.getId())
- .append("_")
- .append(Constants.CONTENT_CACHE_KEY)
- .append("-")
- .append(language.getCode());
+ StringBuilder contentKey = new StringBuilder();
+ contentKey
+ .append(store.getId())
+ .append("_")
+ .append(Constants.CONTENT_CACHE_KEY)
+ .append("-")
+ .append(language.getCode());
- StringBuilder contentKeyMissed = new StringBuilder();
- contentKeyMissed
- .append(contentKey.toString())
- .append(Constants.MISSED_CACHE_KEY);
+ // StringBuilder contentKeyMissed = new StringBuilder();
+ // contentKeyMissed
+ // .append(contentKey.toString())
+ // .append(Constants.MISSED_CACHE_KEY);
Map<String, List<Content>> contents = null;
if(store.isUseCache()) {
//get from the cache
- contents = (Map<String, List<Content>>) cache.getFromCache(contentKey.toString());
+ // contents = (Map<String, List<Content>>) cache.getFromCache(contentKey.toString());
if(contents==null) {
@@ -543,7 +543,7 @@ public class StoreFilter extends HandlerInterceptorAdapter {
contents = this.getContent(store, language);
if(contents!=null && contents.size()>0) {
//put in cache
- cache.putInCache(contents, contentKey.toString());
+ // cache.putInCache(contents, contentKey.toString());
} else {
//put in missed cache
//cache.putInCache(new Boolean(true), contentKeyMissed.toString());
@@ -583,18 +583,18 @@ public class StoreFilter extends HandlerInterceptorAdapter {
@SuppressWarnings("unchecked")
private void setTopCategories(MerchantStore store, Language language, HttpServletRequest request) throws Exception {
- StringBuilder categoriesKey = new StringBuilder();
- categoriesKey
- .append(store.getId())
- .append("_")
- .append(Constants.CATEGORIES_CACHE_KEY)
- .append("-")
- .append(language.getCode());
+ // StringBuilder categoriesKey = new StringBuilder();
+ // categoriesKey
+ // .append(store.getId())
+ // .append("_")
+ // .append(Constants.CATEGORIES_CACHE_KEY)
+ // .append("-")
+ // .append(language.getCode());
- StringBuilder categoriesKeyMissed = new StringBuilder();
- categoriesKeyMissed
- .append(categoriesKey.toString())
- .append(Constants.MISSED_CACHE_KEY);
+ // StringBuilder categoriesKeyMissed = new StringBuilder();
+ // categoriesKeyMissed
+ // .append(categoriesKey.toString())
+ // .append(Constants.MISSED_CACHE_KEY);
//language code - List of category
@@ -602,14 +602,14 @@ public class StoreFilter extends HandlerInterceptorAdapter {
List<ReadableCategory> loadedCategories = null;
if(store.isUseCache()) {
- objects = (Map<String, List<ReadableCategory>>) webApplicationCache.getFromCache(categoriesKey.toString());
+ // objects = (Map<String, List<ReadableCategory>>) webApplicationCache.getFromCache(categoriesKey.toString());
if(objects==null) {
//load categories
loadedCategories = categoryFacade.getCategoryHierarchy(store, 0, language);
objects = new ConcurrentHashMap<String, List<ReadableCategory>>();
objects.put(language.getCode(), loadedCategories);
- webApplicationCache.putInCache(categoriesKey.toString(), objects);
+ // webApplicationCache.putInCache(categoriesKey.toString(), objects);
} else {
loadedCategories = objects.get(language.getCode());
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 2ae58fd..d0559a8 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
@@ -6,7 +6,7 @@ import com.salesmanager.core.business.services.catalog.product.ProductService;
import com.salesmanager.core.business.services.catalog.product.manufacturer.ManufacturerService;
import com.salesmanager.core.business.services.merchant.MerchantStoreService;
import com.salesmanager.core.business.services.reference.language.LanguageService;
-import com.salesmanager.core.business.utils.CacheUtils;
+//import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.model.catalog.category.Category;
import com.salesmanager.core.model.catalog.product.Product;
import com.salesmanager.core.model.catalog.product.ProductCriteria;
@@ -80,8 +80,8 @@ public class ShoppingCategoryController {
@Inject
private BreadcrumbsUtils breadcrumbsUtils;
- @Inject
- private CacheUtils cache;
+// @Inject
+// private CacheUtils cache;
@Inject
private PricingService pricingService;
@@ -190,29 +190,29 @@ public class ShoppingCategoryController {
subIds.add(category.getId());
- StringBuilder subCategoriesCacheKey = new StringBuilder();
- subCategoriesCacheKey
- .append(store.getId())
- .append("_")
- .append(category.getId())
- .append("_")
- .append(Constants.SUBCATEGORIES_CACHE_KEY)
- .append("-")
- .append(language.getCode());
+// StringBuilder subCategoriesCacheKey = new StringBuilder();
+// subCategoriesCacheKey
+// .append(store.getId())
+// .append("_")
+// .append(category.getId())
+// .append("_")
+// .append(Constants.SUBCATEGORIES_CACHE_KEY)
+// .append("-")
+// .append(language.getCode());
- StringBuilder subCategoriesMissed = new StringBuilder();
- subCategoriesMissed
- .append(subCategoriesCacheKey.toString())
- .append(Constants.MISSED_CACHE_KEY);
+// StringBuilder subCategoriesMissed = new StringBuilder();
+// subCategoriesMissed
+// .append(subCategoriesCacheKey.toString())
+// .append(Constants.MISSED_CACHE_KEY);
- List<BigDecimal> prices = new ArrayList<BigDecimal>();
+// List<BigDecimal> prices = new ArrayList<BigDecimal>();
List<ReadableCategory> subCategories = null;
Map<Long,Long> countProductsByCategories = null;
if(store.isUseCache()) {
//get from the cache
- subCategories = (List<ReadableCategory>) cache.getFromCache(subCategoriesCacheKey.toString());
+// subCategories = (List<ReadableCategory>) cache.getFromCache(subCategoriesCacheKey.toString());
if(subCategories==null) {
//get from missed cache
//Boolean missedContent = (Boolean)cache.getFromCache(subCategoriesMissed.toString());
@@ -222,7 +222,7 @@ public class ShoppingCategoryController {
subCategories = getSubCategories(store,category,countProductsByCategories,language,locale);
if(subCategories!=null) {
- cache.putInCache(subCategories, subCategoriesCacheKey.toString());
+// cache.putInCache(subCategories, subCategoriesCacheKey.toString());
} else {
//cache.putInCache(new Boolean(true), subCategoriesCacheKey.toString());
}
@@ -268,24 +268,24 @@ public class ShoppingCategoryController {
/** List of manufacturers **/
if(subCategoryIds!=null && subCategoryIds.size()>0) {
- StringBuilder manufacturersKey = new StringBuilder();
- manufacturersKey
- .append(store.getId())
- .append("_")
- .append(Constants.MANUFACTURERS_BY_PRODUCTS_CACHE_KEY)
- .append("-")
- .append(language.getCode());
+// StringBuilder manufacturersKey = new StringBuilder();
+// manufacturersKey
+// .append(store.getId())
+// .append("_")
+// .append(Constants.MANUFACTURERS_BY_PRODUCTS_CACHE_KEY)
+// .append("-")
+// .append(language.getCode());
- StringBuilder manufacturersKeyMissed = new StringBuilder();
- manufacturersKeyMissed
- .append(manufacturersKey.toString())
- .append(Constants.MISSED_CACHE_KEY);
+// StringBuilder manufacturersKeyMissed = new StringBuilder();
+// manufacturersKeyMissed
+// .append(manufacturersKey.toString())
+// .append(Constants.MISSED_CACHE_KEY);
if(store.isUseCache()) {
//get from the cache
- manufacturerList = (List<ReadableManufacturer>) cache.getFromCache(manufacturersKey.toString());
+// manufacturerList = (List<ReadableManufacturer>) cache.getFromCache(manufacturersKey.toString());
if(manufacturerList==null) {
@@ -294,7 +294,7 @@ public class ShoppingCategoryController {
//if(missedContent==null) {
manufacturerList = this.getManufacturers(store, subCategoryIds, language);
if(manufacturerList.isEmpty()) {
- cache.putInCache(new Boolean(true), manufacturersKeyMissed.toString());
+// cache.putInCache(new Boolean(true), manufacturersKeyMissed.toString());
} else {
//cache.putInCache(manufacturerList, manufacturersKey.toString());
}
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 530961f..fc6c97a 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
@@ -6,7 +6,7 @@ import com.salesmanager.core.business.services.catalog.product.ProductService;
import com.salesmanager.core.business.services.catalog.product.attribute.ProductAttributeService;
import com.salesmanager.core.business.services.catalog.product.relationship.ProductRelationshipService;
import com.salesmanager.core.business.services.catalog.product.review.ProductReviewService;
-import com.salesmanager.core.business.utils.CacheUtils;
+//import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.model.catalog.product.Product;
import com.salesmanager.core.model.catalog.product.attribute.ProductAttribute;
import com.salesmanager.core.model.catalog.product.attribute.ProductOptionDescription;
@@ -77,8 +77,8 @@ public class ShopProductController {
@Inject
private LabelUtils messages;
- @Inject
- private CacheUtils cache;
+// @Inject
+// private CacheUtils cache;
@Inject
private CategoryService categoryService;
@@ -159,18 +159,18 @@ public class ShopProductController {
- StringBuilder relatedItemsCacheKey = new StringBuilder();
- relatedItemsCacheKey
- .append(store.getId())
- .append("_")
- .append(Constants.RELATEDITEMS_CACHE_KEY)
- .append("-")
- .append(language.getCode());
+// StringBuilder relatedItemsCacheKey = new StringBuilder();
+// relatedItemsCacheKey
+// .append(store.getId())
+// .append("_")
+// .append(Constants.RELATEDITEMS_CACHE_KEY)
+// .append("-")
+// .append(language.getCode());
- StringBuilder relatedItemsMissed = new StringBuilder();
- relatedItemsMissed
- .append(relatedItemsCacheKey.toString())
- .append(Constants.MISSED_CACHE_KEY);
+// StringBuilder relatedItemsMissed = new StringBuilder();
+// relatedItemsMissed
+// .append(relatedItemsCacheKey.toString())
+// .append(Constants.MISSED_CACHE_KEY);
Map<Long,List<ReadableProduct>> relatedItemsMap = null;
List<ReadableProduct> relatedItems = null;
@@ -178,7 +178,7 @@ public class ShopProductController {
if(store.isUseCache()) {
//get from the cache
- relatedItemsMap = (Map<Long,List<ReadableProduct>>) cache.getFromCache(relatedItemsCacheKey.toString());
+// relatedItemsMap = (Map<Long,List<ReadableProduct>>) cache.getFromCache(relatedItemsCacheKey.toString());
if(relatedItemsMap==null) {
//get from missed cache
//Boolean missedContent = (Boolean)cache.getFromCache(relatedItemsMissed.toString());
@@ -186,9 +186,9 @@ public class ShopProductController {
//if(missedContent==null) {
relatedItems = relatedItems(store, product, language);
if(relatedItems!=null) {
- relatedItemsMap = new HashMap<Long,List<ReadableProduct>>();
- relatedItemsMap.put(product.getId(), relatedItems);
- cache.putInCache(relatedItemsMap, relatedItemsCacheKey.toString());
+// relatedItemsMap = new HashMap<Long,List<ReadableProduct>>();
+// relatedItemsMap.put(product.getId(), relatedItems);
+// cache.putInCache(relatedItemsMap, relatedItemsCacheKey.toString());
} else {
//cache.putInCache(new Boolean(true), relatedItemsMissed.toString());
}
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 2310f79..0f978d2 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
@@ -15,7 +15,7 @@ import org.springframework.web.servlet.tags.RequestContextAwareTag;
import com.salesmanager.core.business.services.catalog.product.PricingService;
import com.salesmanager.core.business.services.catalog.product.relationship.ProductRelationshipService;
-import com.salesmanager.core.business.utils.CacheUtils;
+//import com.salesmanager.core.business.utils.CacheUtils;
import com.salesmanager.core.model.catalog.product.Product;
import com.salesmanager.core.model.catalog.product.relationship.ProductRelationship;
import com.salesmanager.core.model.merchant.MerchantStore;
@@ -44,8 +44,8 @@ public class ShopProductRelationshipTag extends RequestContextAwareTag {
@Inject
private PricingService pricingService;
- @Inject
- private CacheUtils cache;
+// @Inject
+// private CacheUtils cache;
@Inject
@Qualifier("img")
@@ -81,36 +81,36 @@ public class ShopProductRelationshipTag extends RequestContextAwareTag {
MerchantStore store = (MerchantStore)request.getAttribute(Constants.MERCHANT_STORE);
- Language language = (Language)request.getAttribute(Constants.LANGUAGE);
-
- StringBuilder groupKey = new StringBuilder();
- groupKey
- .append(store.getId())
- .append("_")
- .append(Constants.PRODUCTS_GROUP_CACHE_KEY)
- .append("-")
- .append(this.getGroupName())
- .append("_")
- .append(language.getCode());
+// Language language = (Language)request.getAttribute(Constants.LANGUAGE);
+
+// StringBuilder groupKey = new StringBuilder();
+// groupKey
+// .append(store.getId())
+// .append("_")
+// .append(Constants.PRODUCTS_GROUP_CACHE_KEY)
+// .append("-")
+// .append(this.getGroupName())
+// .append("_")
+// .append(language.getCode());
- StringBuilder groupKeyMissed = new StringBuilder();
- groupKeyMissed
- .append(groupKey.toString())
- .append(Constants.MISSED_CACHE_KEY);
+// StringBuilder groupKeyMissed = new StringBuilder();
+// groupKeyMissed
+// .append(groupKey.toString())
+// .append(Constants.MISSED_CACHE_KEY);
List<ReadableProduct> objects = null;
if(store.isUseCache()) {
//get from the cache
- objects = (List<ReadableProduct>) cache.getFromCache(groupKey.toString());
+// objects = (List<ReadableProduct>) cache.getFromCache(groupKey.toString());
Boolean missedContent = null;
if(objects==null && missedContent==null) {
objects = getProducts(request);
//put in cache
- cache.putInCache(objects, groupKey.toString());
+// cache.putInCache(objects, groupKey.toString());
} else {
//put in missed cache
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/WebApplicationCacheUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/WebApplicationCacheUtils.java
index a5505e2..9e9941c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/WebApplicationCacheUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/WebApplicationCacheUtils.java
@@ -1,6 +1,6 @@
package com.salesmanager.shop.utils;
-import com.salesmanager.core.business.utils.CacheUtils;
+// import com.salesmanager.core.business.utils.CacheUtils;
import org.springframework.stereotype.Component;
import javax.inject.Inject;
@@ -8,15 +8,15 @@ import javax.inject.Inject;
@Component
public class WebApplicationCacheUtils {
- @Inject
- private CacheUtils cache;
+ // @Inject
+ // private CacheUtils cache;
- public Object getFromCache(String key) throws Exception {
- return cache.getFromCache(key);
- }
+ // public Object getFromCache(String key) throws Exception {
+ // return cache.getFromCache(key);
+ // }
- public void putInCache(String key, Object object) throws Exception {
- cache.putInCache(object, key);
- }
+ // public void putInCache(String key, Object object) throws Exception {
+ // cache.putInCache(object, key);
+ // }
}