[DPG-1388]-implemented-redis-caching

business-services/dashboard-analytics/pom.xml

@@ -23,6 +23,14 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-cache</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

business-services/dashboard-analytics/src/main/java/com/tarento/analytics/AnalyticApp.java

@@ -6,7 +6,13 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Profile;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -16,11 +22,13 @@
 
 import com.tarento.analytics.constant.Constants;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 
 @SpringBootApplication
 @EnableCaching
+@ComponentScan(basePackages = {"com.tarento.analytics"})
 public class AnalyticApp {
 	 public static void main( String[] args ) {
 	        SpringApplication.run(AnalyticApp.class, args);
@@ -48,11 +56,15 @@ public void addCorsMappings(CorsRegistry registry) {
 	        };
 	    }
 
-		@Bean
-		@Profile("!test")
-		public CacheManager cacheManager(){
-			return new SpringCache2kCacheManager().addCaches(b->b.name("versions").expireAfterWrite(cacheExpiry, TimeUnit.MINUTES)
-				.entryCapacity(cacheCapacity));
-		}
+	@Bean
+	public RedisCacheManager cacheManager(RedisConnectionFactory redisConnectionFactory) {
+		RedisCacheConfiguration cacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
+				.entryTtl(Duration.ofMinutes(5)) // set TTL to 5 minutes
+				.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer()));
+
+		return RedisCacheManager.builder(redisConnectionFactory)
+				.cacheDefaults(cacheConfiguration)
+				.build();
+	}
 
 }

business-services/dashboard-analytics/src/main/java/com/tarento/analytics/dto/Data.java

@@ -8,8 +8,10 @@ public class Data {
     private String headerName;
     private Object headerValue;
     private String headerSymbol;
-    private InsightsWidget insight; 
-
+    private InsightsWidget insight;
+
+    public Data() {
+    }
     public InsightsWidget getInsight() {
 		return insight;
 	}

business-services/dashboard-analytics/src/main/java/com/tarento/analytics/dto/Plot.java

@@ -9,6 +9,8 @@ public class Plot {
     private String strValue;
     private String symbol;
 
+    public Plot(){
+    }
     public Plot(String name, Double value, String symbol) {
         this.name = name;
         this.value = value;

business-services/dashboard-analytics/src/main/java/com/tarento/analytics/org/service/MdmsServiceImpl.java

@@ -13,6 +13,7 @@
 import com.tarento.analytics.handler.ResponseHandlerFactory;
 import com.tarento.analytics.service.QueryService;
 import com.tarento.analytics.service.impl.RestService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @Component
 public class MdmsServiceImpl implements ClientService {
 
@@ -48,6 +50,7 @@ public class MdmsServiceImpl implements ClientService {
     @Override
     @Cacheable(value="versions", key="#request.hashKey")
     public AggregateDto getAggregatedData(AggregateRequestDto request, List<RoleDto> roles) throws AINException, IOException {
+        log.info("This data is cached from Database");
         // Read visualization Code
         String chartId = request.getVisualizationCode();
         logger.info("chartId >> "+chartId);

business-services/dashboard-analytics/src/main/java/com/tarento/analytics/org/service/TarentoServiceImpl.java

@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,7 +38,7 @@
 import com.tarento.analytics.service.impl.RestService;
 import com.tarento.analytics.utils.ResponseRecorder;
 
-
+@Slf4j
 @Component
 public class TarentoServiceImpl implements ClientService {
 
@@ -68,6 +69,7 @@ public class TarentoServiceImpl implements ClientService {
 	@Override
 	@Cacheable(value="versions", key="#request.hashKey")
 	public AggregateDto getAggregatedData(AggregateRequestDto request, List<RoleDto> roles) throws AINException, IOException {
+		log.info("This data is cached from Database");
 		// Read visualization Code
 		String internalChartId = request.getVisualizationCode();
 		ObjectNode aggrObjectNode = JsonNodeFactory.instance.objectNode();

business-services/dashboard-analytics/src/main/resources/application.properties

@@ -50,6 +50,10 @@ filename.length=10
 filename.useletters=true
 filename.usenumbers=false
 
+# CACHE CONFIG
+spring.redis.host=localhost
+spring.redis.port=6379
+
 cache.expiry.time.in.minutes=10
 cache.capacity=120