Divide redisFactory class. Apply codecov again

longcoding · longcoding · commit f9b323365287 · 2019-07-24T18:16:32.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -15,9 +15,9 @@ before_script:
   - "chmod +x gradlew"
 script:
   - "./gradlew clean build"
-  #- "./gradlew clean jacocoTestReport"
+  - "./gradlew clean jacocoTestReport"
 after_success:
-  #:- "bash <(curl -s https://codecov.io/bash) -t 173de125-e3f2-41eb-ab59-afca23c26c40"
+  :- "bash <(curl -s https://codecov.io/bash) -t 173de125-e3f2-41eb-ab59-afca23c26c40"
 
 notifications:
   email:
diff --git a/build.gradle b/build.gradle
@@ -73,8 +73,6 @@ dependencies {
 
 	// test
 	testCompile('org.springframework.boot:spring-boot-starter-test')
-	testCompile('junit:junit:4.13-beta-1')
-	testCompile('ai.grakn:redis-mock:0.1.6')
 
 }
 
diff --git a/src/main/java/com/longcoding/moon/MoonApplication.java b/src/main/java/com/longcoding/moon/MoonApplication.java
@@ -32,8 +32,6 @@ public static void main(String[] args) {
                 .properties("spring.config.location:classpath:/apps/, classpath:/apis/, classpath:/")
                 .build().run(args);
 
-
-
     }
 
 }
diff --git a/src/main/java/com/longcoding/moon/configs/MoonServletConfig.java b/src/main/java/com/longcoding/moon/configs/MoonServletConfig.java
@@ -5,7 +5,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.common.collect.Lists;
+import com.longcoding.moon.interceptors.AbstractBaseInterceptor;
 import com.longcoding.moon.interceptors.impl.*;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
@@ -38,6 +40,10 @@ public class MoonServletConfig implements WebMvcConfigurer {
      * The internal api and swagger settings are likely to change.
      */
 
+    @Value("${moon.service.api-ratelimit.enable}")
+    boolean useApiRatelimit;
+
+
     private static final List<String> EXCLUDE_PATH_INTERNAL_API = Arrays.asList("/internal/**", "/");
     private static final List<String> EXCLUDE_PATH_SWAGGER_UI = Arrays.asList("/swagger-ui.html", "/swagger-resources/**", "/v2/api-docs", "/webjars/**", "/error", "/csrf", "/");
     private static List<String> EXCLUDE_TOTAL_PATH = Lists.newArrayList();
@@ -81,14 +87,14 @@ public class MoonServletConfig implements WebMvcConfigurer {
      * It is aimed to prevent load of outbound service.
      */
     @Bean
-    public ServiceCapacityInterceptor serviceCapacityInterceptor() { return new ServiceCapacityInterceptor(); }
+    public AbstractBaseInterceptor serviceCapacityInterceptor() { return useApiRatelimit? new ServiceCapacityInterceptor() : new NoRatelimitInterceptor(); }
 
     /**
      * ServiceCapacity interceptor and ApplicationRatelimitInterceptor are preliminary tasks to execute executeRedisValidation.
      * Execute the stored job at once and determine whether the request can be passed to the outbound service.
      * */
     @Bean
-    public ExecuteRedisValidationInterceptor executeRedisValidationInterceptor() { return new ExecuteRedisValidationInterceptor(); }
+    public AbstractBaseInterceptor executeRedisValidationInterceptor() { return useApiRatelimit? new ExecuteRedisValidationInterceptor(): new NoRatelimitInterceptor(); }
 
     /**
      * Split the request path by '/' and save it.
@@ -117,7 +123,7 @@ public class MoonServletConfig implements WebMvcConfigurer {
      * Later, it may lead to a billing model.
      */
     @Bean
-    public ApplicationRatelimitInterceptor applicationRatelimitInterceptor() { return new ApplicationRatelimitInterceptor(); }
+    public AbstractBaseInterceptor applicationRatelimitInterceptor() { return useApiRatelimit? new ApplicationRatelimitInterceptor(): new NoRatelimitInterceptor(); }
 
     /**
      * Also check the service contract.
diff --git a/src/main/java/com/longcoding/moon/helpers/APIExposeSpecLoader.java b/src/main/java/com/longcoding/moon/helpers/APIExposeSpecLoader.java
@@ -4,7 +4,6 @@
 import com.longcoding.moon.configs.APIExposeSpecConfig;
 import com.longcoding.moon.exceptions.ExceptionType;
 import com.longcoding.moon.exceptions.GeneralException;
-import com.longcoding.moon.helpers.cluster.IClusterRepository;
 import com.longcoding.moon.models.apis.TransformData;
 import com.longcoding.moon.models.cluster.ApiSync;
 import com.longcoding.moon.models.ehcache.ApiInfo;
@@ -108,7 +107,8 @@ public void afterPropertiesSet() throws Exception {
                         .routingType(serviceRoutingType)
                         .build();
                 apiExposeSpecification.getServiceInfoCache().put(service.getServiceId(), serviceInfo);
-                clusterRepository.setServiceInfo(serviceInfo);
+
+                if (enableCluster) clusterRepository.setServiceInfo(serviceInfo);
             });
         } catch (Exception ex) {
             throw new GeneralException(ExceptionType.E_1200_FAIL_SERVICE_INFO_CONFIGURATION_INIT, ex);
@@ -158,9 +158,9 @@ public void afterPropertiesSet() throws Exception {
                             .transformData(transformRequests)
                             .build();
 
-                    clusterRepository.setApiInfo(apiInfo);
                     apiExposeSpecification.getApiInfoCache().put(apiSpec.getApiId(), apiInfo);
 
+                    if (enableCluster) clusterRepository.setApiInfo(apiInfo);
                 });
             });
 
diff --git a/src/main/java/com/longcoding/moon/helpers/ClusterSyncUtil.java b/src/main/java/com/longcoding/moon/helpers/ClusterSyncUtil.java
@@ -1,4 +1,4 @@
-package com.longcoding.moon.helpers.cluster;
+package com.longcoding.moon.helpers;
 
 import com.longcoding.moon.helpers.Constant;
 import com.longcoding.moon.helpers.JedisFactory;
diff --git a/src/main/java/com/longcoding/moon/helpers/DBClusterRepository.java b/src/main/java/com/longcoding/moon/helpers/DBClusterRepository.java
@@ -1,4 +1,4 @@
-package com.longcoding.moon.helpers.cluster;
+package com.longcoding.moon.helpers;
 
 import com.longcoding.moon.exceptions.ExceptionType;
 import com.longcoding.moon.exceptions.GeneralException;
diff --git a/src/main/java/com/longcoding/moon/helpers/IClusterRepository.java b/src/main/java/com/longcoding/moon/helpers/IClusterRepository.java
@@ -1,4 +1,4 @@
-package com.longcoding.moon.helpers.cluster;
+package com.longcoding.moon.helpers;
 
 import com.longcoding.moon.models.ehcache.ApiInfo;
 import com.longcoding.moon.models.ehcache.AppInfo;
diff --git a/src/main/java/com/longcoding/moon/helpers/InitAppLoader.java b/src/main/java/com/longcoding/moon/helpers/InitAppLoader.java
@@ -3,7 +3,6 @@
 import com.longcoding.moon.configs.InitAppConfig;
 import com.longcoding.moon.exceptions.ExceptionType;
 import com.longcoding.moon.exceptions.GeneralException;
-import com.longcoding.moon.helpers.cluster.IClusterRepository;
 import com.longcoding.moon.models.cluster.AppSync;
 import com.longcoding.moon.models.ehcache.AppInfo;
 import com.longcoding.moon.models.enumeration.SyncType;
@@ -17,7 +16,6 @@
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.stream.Collectors;
 
 /**
  * A class that takes application information and loads it into the cache.
@@ -58,9 +56,7 @@ public void afterPropertiesSet() throws Exception {
         if (enableCluster) {
             try {
                 clusterRepository.getAllAppInfo()
-                        .forEach(appInfo -> {
-                            syncService.syncAppInfoToCache(new AppSync(SyncType.CREATE, appInfo));
-                        });
+                        .forEach(appInfo -> syncService.syncAppInfoToCache(new AppSync(SyncType.CREATE, appInfo)));
             } catch (Exception ex) {
                 throw new GeneralException(ExceptionType.E_1203_FAIL_CLUSTER_SYNC, ex);
             }
@@ -88,9 +84,9 @@ public void afterPropertiesSet() throws Exception {
                             .build();
 
                     appInfoCaches.put(app.getAppId(), appInfo);
-
-                    clusterRepository.setAppInfo(appInfo);
                     aclIpChecker.enrolledInitAclIp(app.getAppId(), app.getAppIpAcl());
+
+                    if (enableCluster) clusterRepository.setAppInfo(appInfo);
                 });
 
             } catch (Exception ex) {
diff --git a/src/main/java/com/longcoding/moon/helpers/RedisClusterRepository.java b/src/main/java/com/longcoding/moon/helpers/RedisClusterRepository.java
@@ -1,10 +1,7 @@
-package com.longcoding.moon.helpers.cluster;
+package com.longcoding.moon.helpers;
 
 import com.longcoding.moon.exceptions.ExceptionType;
 import com.longcoding.moon.exceptions.GeneralException;
-import com.longcoding.moon.helpers.Constant;
-import com.longcoding.moon.helpers.JedisFactory;
-import com.longcoding.moon.helpers.JsonUtil;
 import com.longcoding.moon.models.ehcache.ApiInfo;
 import com.longcoding.moon.models.ehcache.AppInfo;
 import com.longcoding.moon.models.ehcache.ServiceInfo;
diff --git a/src/main/java/com/longcoding/moon/helpers/RedisValidator.java b/src/main/java/com/longcoding/moon/helpers/RedisValidator.java
@@ -20,7 +20,7 @@
  */
 @Getter
 @EqualsAndHashCode
-public class RedisValidator<T> implements DisposableBean {
+public class RedisValidator<T> {
 
     private Jedis jedis;
     private Transaction jedisMulti;
@@ -32,8 +32,8 @@ public class RedisValidator<T> implements DisposableBean {
 
     private RedisValidator() {}
 
-    public RedisValidator(JedisFactory jedisFactory) {
-        this.jedis = jedisFactory.getInstance();
+    public RedisValidator(Jedis jedis) {
+        this.jedis = jedis;
         this.jedisMulti = jedis.multi();
         this.futureMethodQueue = new LinkedHashMap<>();
     }
@@ -47,8 +47,4 @@ public RedisValidator(JedisFactory jedisFactory) {
      */
     public void offerFutureMethodQueue(String className, T responseValue) { futureMethodQueue.put(className, responseValue); }
 
-    @Override
-    public void destroy() throws Exception {
-        this.jedis.close();
-    }
 }
diff --git a/src/main/java/com/longcoding/moon/interceptors/RedisBaseValidationInterceptor.java b/src/main/java/com/longcoding/moon/interceptors/RedisBaseValidationInterceptor.java
@@ -1,6 +1,7 @@
 package com.longcoding.moon.interceptors;
 
 import com.google.common.base.CaseFormat;
+import com.longcoding.moon.helpers.JedisFactory;
 import com.longcoding.moon.interceptors.impl.ExecuteRedisValidationInterceptor;
 import com.longcoding.moon.interceptors.impl.PathAndAppAndPrepareRedisInterceptor;
 import com.longcoding.moon.helpers.APIExposeSpecification;
@@ -12,6 +13,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Objects;
 
 /**
  * An abstract class for an interceptor that uses RedisValidator.
@@ -27,10 +29,12 @@
  */
 public abstract class RedisBaseValidationInterceptor<T> extends AbstractBaseInterceptor {
 
-
     @Autowired
     protected APIExposeSpecification apiExposeSpec;
 
+    @Autowired
+    JedisFactory jedisFactory;
+
     private volatile T futureValue;
     private RedisValidator redisValidator;
     protected RequestInfo requestInfo;
@@ -65,10 +69,10 @@ protected boolean onFailure(T storedValue, Transaction jedisMulti) {
     @Override
     @SuppressWarnings("unchecked")
     public boolean preHandler(HttpServletRequest request,
-                                          HttpServletResponse response, Object handler) throws Exception {
+                                          HttpServletResponse response, Object handler) {
 
         this.requestInfo = (RequestInfo) request.getAttribute(Constant.REQUEST_INFO_DATA);
-        this.redisValidator = (RedisValidator) request.getAttribute(Constant.OBJECT_GET_REDIS_VALIDATION);
+        this.redisValidator = getRedisValidator(request);
         this.futureValue = setJedisMultiCommand(redisValidator.getJedisMulti());
         redisValidator.offerFutureMethodQueue(CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, getClass().getSimpleName()), futureValue);
 
@@ -83,4 +87,14 @@ public boolean executeJudge(T storedValue, Transaction jedisMulti) {
         return setCondition(storedValue)? onSuccess(storedValue, jedisMulti) : onFailure(storedValue, jedisMulti);
     }
 
+    private RedisValidator getRedisValidator(HttpServletRequest request) {
+        RedisValidator redisValidator = (RedisValidator) request.getAttribute(Constant.OBJECT_GET_REDIS_VALIDATION);
+        if (Objects.isNull(redisValidator)) {
+            redisValidator = new RedisValidator(jedisFactory.getInstance());
+            request.setAttribute(Constant.OBJECT_GET_REDIS_VALIDATION, redisValidator);
+        }
+
+        return redisValidator;
+    }
+
 }
diff --git a/src/main/java/com/longcoding/moon/interceptors/impl/ExecuteRedisValidationInterceptor.java b/src/main/java/com/longcoding/moon/interceptors/impl/ExecuteRedisValidationInterceptor.java
@@ -50,18 +50,17 @@ public void afterPropertiesSet() throws Exception {
 
     @Override
     @SuppressWarnings("unchecked")
-    public boolean preHandler(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+    public boolean preHandler(HttpServletRequest request, HttpServletResponse response, Object handler) {
 
         RedisValidator redisValidator = (RedisValidator) request.getAttribute(Constant.OBJECT_GET_REDIS_VALIDATION);
 
-        try {
+        try (Jedis jedis = jedisFactory.getInstance()){
+            redisValidator.getJedisMulti().setClient(jedis.getClient());
             redisValidator.getJedisMulti().exec();
             redisValidator.getJedisMulti().close();
         } catch (JedisConnectionException e) {
             log.error("{}", e);
             generateException(ExceptionType.E_1101_API_GATEWAY_IS_EXHAUSTED);
-        } finally {
-            redisValidator.getJedis().close();
         }
 
         LinkedHashMap<String, T> futureMethodQueue = redisValidator.getFutureMethodQueue();
diff --git a/src/main/java/com/longcoding/moon/interceptors/impl/NoRatelimitInterceptor.java b/src/main/java/com/longcoding/moon/interceptors/impl/NoRatelimitInterceptor.java
@@ -0,0 +1,14 @@
+package com.longcoding.moon.interceptors.impl;
+
+import com.longcoding.moon.interceptors.AbstractBaseInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class NoRatelimitInterceptor extends AbstractBaseInterceptor {
+
+    @Override
+    public boolean preHandler(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        return true;
+    }
+}
diff --git a/src/main/java/com/longcoding/moon/interceptors/impl/PathAndAppAndPrepareRedisInterceptor.java b/src/main/java/com/longcoding/moon/interceptors/impl/PathAndAppAndPrepareRedisInterceptor.java
@@ -29,9 +29,6 @@ public class PathAndAppAndPrepareRedisInterceptor extends AbstractBaseIntercepto
     @Autowired
     MessageManager messageManager;
 
-    @Autowired
-    JedisFactory jedisFactory;
-
     @Autowired
     APIExposeSpecification apiExposeSpec;
 
@@ -82,7 +79,6 @@ public boolean preHandler(HttpServletRequest request, HttpServletResponse respon
         requestInfo.setOutboundURL(outboundUrl);
         requestInfo.setRoutingType(routingInfo.getRoutingType());
 
-        prepareRedisInterceptors(request);
         return true;
     }
 
@@ -107,9 +103,6 @@ private String classifyCategory(String requestURL, boolean isDelimiterSubdomain)
         return category[index];
     }
 
-    private void prepareRedisInterceptors(HttpServletRequest request) {
-        RedisValidator redisValidator = new RedisValidator(jedisFactory);
-        request.setAttribute(Constant.OBJECT_GET_REDIS_VALIDATION, redisValidator);
-    }
+
 
 }
diff --git a/src/main/java/com/longcoding/moon/schedulers/ClusterSync.java b/src/main/java/com/longcoding/moon/schedulers/ClusterSync.java
@@ -1,7 +1,7 @@
 package com.longcoding.moon.schedulers;
 
 import com.longcoding.moon.helpers.*;
-import com.longcoding.moon.helpers.cluster.ClusterSyncUtil;
+import com.longcoding.moon.helpers.ClusterSyncUtil;
 import com.longcoding.moon.models.cluster.ServiceSync;
 import com.longcoding.moon.models.cluster.WhitelistIpSync;
 import com.longcoding.moon.models.cluster.ApiSync;
diff --git a/src/main/java/com/longcoding/moon/services/internal/ApiService.java b/src/main/java/com/longcoding/moon/services/internal/ApiService.java
@@ -2,8 +2,8 @@
 
 import com.longcoding.moon.helpers.Constant;
 import com.longcoding.moon.helpers.JsonUtil;
-import com.longcoding.moon.helpers.cluster.ClusterSyncUtil;
-import com.longcoding.moon.helpers.cluster.IClusterRepository;
+import com.longcoding.moon.helpers.ClusterSyncUtil;
+import com.longcoding.moon.helpers.IClusterRepository;
 import com.longcoding.moon.models.cluster.ApiSync;
 import com.longcoding.moon.models.ehcache.ApiInfo;
 import com.longcoding.moon.models.ehcache.ApiMetaInfo;
diff --git a/src/main/java/com/longcoding/moon/services/internal/AppService.java b/src/main/java/com/longcoding/moon/services/internal/AppService.java
@@ -1,10 +1,10 @@
 package com.longcoding.moon.services.internal;
 
 import com.longcoding.moon.exceptions.GeneralException;
-import com.longcoding.moon.helpers.cluster.ClusterSyncUtil;
+import com.longcoding.moon.helpers.ClusterSyncUtil;
 import com.longcoding.moon.helpers.Constant;
 import com.longcoding.moon.helpers.JsonUtil;
-import com.longcoding.moon.helpers.cluster.IClusterRepository;
+import com.longcoding.moon.helpers.IClusterRepository;
 import com.longcoding.moon.models.cluster.AppSync;
 import com.longcoding.moon.models.cluster.WhitelistIpSync;
 import com.longcoding.moon.models.ehcache.AppInfo;
diff --git a/src/main/java/com/longcoding/moon/services/internal/ServiceService.java b/src/main/java/com/longcoding/moon/services/internal/ServiceService.java
@@ -2,8 +2,8 @@
 
 import com.longcoding.moon.helpers.Constant;
 import com.longcoding.moon.helpers.JsonUtil;
-import com.longcoding.moon.helpers.cluster.ClusterSyncUtil;
-import com.longcoding.moon.helpers.cluster.IClusterRepository;
+import com.longcoding.moon.helpers.ClusterSyncUtil;
+import com.longcoding.moon.helpers.IClusterRepository;
 import com.longcoding.moon.models.cluster.ServiceSync;
 import com.longcoding.moon.models.ehcache.ServiceInfo;
 import com.longcoding.moon.models.enumeration.RoutingType;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
@@ -14,6 +14,8 @@ moon:
       isasync: true
       async.thread.count: 100
     proxy-timeout: 20000
+    api-ratelimit:
+      enable: false
 
 ################################################################################
 # Jedis Config
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
@@ -14,6 +14,8 @@ moon:
       isasync: true
       async.thread.count: 100
     proxy-timeout: 20000
+    api-ratelimit:
+      enable: false
 
 ################################################################################
 # Jedis Config
@@ -31,7 +33,7 @@ jedis-client:
   test-on-return: true
   test-while-idle: true
   host: '127.0.0.1'
-  port: 6379
+  port: 63799898
   timeout: 1000
   database: 0
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
diff --git a/src/test/java/com/longcoding/moon/helpers/APIExposeSpecLoader.java b/src/test/java/com/longcoding/moon/helpers/APIExposeSpecLoader.java
diff --git a/src/test/java/com/longcoding/moon/helpers/InitAppLoader.java b/src/test/java/com/longcoding/moon/helpers/InitAppLoader.java
diff --git a/src/test/java/com/longcoding/moon/helpers/JedisFactory.java b/src/test/java/com/longcoding/moon/helpers/JedisFactory.java
diff --git a/src/test/java/com/longcoding/moon/services/ProxyServiceTest.java b/src/test/java/com/longcoding/moon/services/ProxyServiceTest.java
diff --git a/src/test/resources/application-apis.yml b/src/test/resources/application-apis.yml
diff --git a/src/test/resources/application-apps.yml b/src/test/resources/application-apps.yml
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,6 @@ dependencies {`
`73`	`73`
`74`	`74`	`// test`
`75`	`75`	`testCompile('org.springframework.boot:spring-boot-starter-test')`
`76`		`- testCompile('junit:junit:4.13-beta-1')`
`77`		`- testCompile('ai.grakn:redis-mock:0.1.6')`
`78`	`76`
`79`	`77`	`}`
`80`	`78`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ public static void main(String[] args) {`
`32`	`32`	`.properties("spring.config.location:classpath:/apps/, classpath:/apis/, classpath:/")`
`33`	`33`	`.build().run(args);`
`34`	`34`
`35`		`-`
`36`		`-`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.longcoding.moon.helpers.cluster;`
	`1`	`+package com.longcoding.moon.helpers;`
`2`	`2`
`3`	`3`	`import com.longcoding.moon.helpers.Constant;`
`4`	`4`	`import com.longcoding.moon.helpers.JedisFactory;`