Merge pull request #43 from OpenFluxGate/release/0.3.3

[fluxgate] Release/0.3.3

Author: rojae

.github/workflows/maven-ci.yml

@@ -7,7 +7,9 @@ on:
     branches: [ "main" ]
 
 jobs:
-  build:
+  # Build and test with Java 21 (all modules)
+  build-java21:
+    name: Build & Test (Java 21 - All Modules)
     runs-on: ubuntu-latest
 
     services:
@@ -61,10 +63,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: "21"
+          java-version: '21'
           distribution: temurin
           cache: maven
 
@@ -88,6 +90,167 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-results
+          name: test-results-java21
           path: '**/target/surefire-reports/*.xml'
 
+  # Build and test Spring Boot 2.x modules with Java 11
+  build-java11:
+    name: Build & Test (Java 11 - Spring Boot 2.x)
+    runs-on: ubuntu-latest
+
+    services:
+      mongo:
+        image: mongo:7.0
+        env:
+          MONGO_INITDB_ROOT_USERNAME: fluxgate
+          MONGO_INITDB_ROOT_PASSWORD: fluxgate123
+          MONGO_INITDB_DATABASE: fluxgate
+        ports:
+          - 27017:27017
+        options: >-
+          --health-cmd "mongosh --username fluxgate --password fluxgate123 --authenticationDatabase admin --eval 'db.adminCommand(\"ping\")'"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+
+      redis:
+        image: redis:7-alpine
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+
+      redis-cluster:
+        image: grokzen/redis-cluster:7.0.10
+        env:
+          IP: "0.0.0.0"
+          INITIAL_PORT: 7100
+        ports:
+          - 7100:7100
+          - 7101:7101
+          - 7102:7102
+          - 7103:7103
+          - 7104:7104
+          - 7105:7105
+        options: >-
+          --health-cmd "redis-cli -p 7100 cluster info | grep cluster_state:ok"
+          --health-interval=10s
+          --health-timeout=10s
+          --health-retries=10
+
+    env:
+      FLUXGATE_MONGO_URI: "mongodb://fluxgate:fluxgate123@localhost:27017/fluxgate?authSource=admin"
+      FLUXGATE_MONGO_DB: "fluxgate"
+      FLUXGATE_REDIS_URI: "redis://localhost:6379"
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: temurin
+          cache: maven
+
+      - name: Build core modules with Java 11
+        run: |
+          # Build only Java 11 compatible modules
+          mvn -B install -DskipTests \
+            -pl fluxgate-core,fluxgate-mongo-adapter,fluxgate-redis-ratelimiter,fluxgate-spring-boot2-starter \
+            -am
+
+      - name: Test Spring Boot 2.x starter with Java 11
+        run: |
+          mvn -B verify \
+            -pl fluxgate-core,fluxgate-mongo-adapter,fluxgate-redis-ratelimiter,fluxgate-spring-boot2-starter
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: test-results-java11
+          path: '**/target/surefire-reports/*.xml'
+
+  # Build and test with Java 17 (Spring Boot 3.x minimum)
+  build-java17:
+    name: Build & Test (Java 17 - Spring Boot 3.x)
+    runs-on: ubuntu-latest
+
+    services:
+      mongo:
+        image: mongo:7.0
+        env:
+          MONGO_INITDB_ROOT_USERNAME: fluxgate
+          MONGO_INITDB_ROOT_PASSWORD: fluxgate123
+          MONGO_INITDB_DATABASE: fluxgate
+        ports:
+          - 27017:27017
+        options: >-
+          --health-cmd "mongosh --username fluxgate --password fluxgate123 --authenticationDatabase admin --eval 'db.adminCommand(\"ping\")'"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+
+      redis:
+        image: redis:7-alpine
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+
+      redis-cluster:
+        image: grokzen/redis-cluster:7.0.10
+        env:
+          IP: "0.0.0.0"
+          INITIAL_PORT: 7100
+        ports:
+          - 7100:7100
+          - 7101:7101
+          - 7102:7102
+          - 7103:7103
+          - 7104:7104
+          - 7105:7105
+        options: >-
+          --health-cmd "redis-cli -p 7100 cluster info | grep cluster_state:ok"
+          --health-interval=10s
+          --health-timeout=10s
+          --health-retries=10
+
+    env:
+      FLUXGATE_MONGO_URI: "mongodb://fluxgate:fluxgate123@localhost:27017/fluxgate?authSource=admin"
+      FLUXGATE_MONGO_DB: "fluxgate"
+      FLUXGATE_REDIS_URI: "redis://localhost:6379"
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: temurin
+          cache: maven
+
+      - name: Build all modules with Java 17 (excluding Java 21 samples)
+        run: |
+          mvn -B install -DskipTests \
+            -pl !fluxgate-samples/fluxgate-sample-standalone-java21
+
+      - name: Test Spring Boot 3.x starter with Java 17
+        run: |
+          mvn -B verify \
+            -pl fluxgate-core,fluxgate-mongo-adapter,fluxgate-redis-ratelimiter,fluxgate-spring-boot3-starter
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: test-results-java17
+          path: '**/target/surefire-reports/*.xml'

.github/workflows/release.yml

@@ -113,4 +113,5 @@ jobs:
             fluxgate-core/target/*.jar
             fluxgate-redis-ratelimiter/target/*.jar
             fluxgate-mongo-adapter/target/*.jar
-            fluxgate-spring-boot-starter/target/*.jar
+            fluxgate-spring-boot2-starter/target/*.jar
+            fluxgate-spring-boot3-starter/target/*.jar

CONTRIBUTING.ko.md

@@ -26,7 +26,7 @@ FluxGate에 기여해 주셔서 감사합니다! 이 문서는 기여를 위한
 
 ### 사전 요구 사항
 
-- **Java 21+** - 프로젝트 빌드 및 실행에 필요
+- **Java 11+** - 프로젝트 빌드 및 실행에 필요
 - **Maven 3.8+** - 빌드 도구
 - **Docker** - 개발 중 Redis 및 MongoDB 실행용
 - **Git** - 버전 관리

CONTRIBUTING.md

@@ -27,7 +27,7 @@ By participating in this project, you agree to maintain a respectful and inclusi
 
 ### Prerequisites
 
-- **Java 21+** - Required for building and running the project
+- **Java 11+** - Required for building and running the project
 - **Maven 3.8+** - Build tool
 - **Docker** - For running Redis and MongoDB during development
 - **Git** - Version control

README.ko.md

@@ -1,7 +1,7 @@
 # FluxGate
 
-[![Java](https://img.shields.io/badge/Java-21%2B-blue.svg)](https://openjdk.org/)
-[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.3.x-brightgreen.svg)](https://spring.io/projects/spring-boot)
+[![Java](https://img.shields.io/badge/Java-11%2B-blue.svg)](https://openjdk.org/)
+[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.7.x%20%7C%203.x-brightgreen.svg)](https://spring.io/projects/spring-boot)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![Build](https://github.com/OpenFluxGate/fluxgate/actions/workflows/maven-ci.yml/badge.svg)](https://github.com/OpenFluxGate/fluxgate/actions)
 [![Admin UI](https://img.shields.io/badge/Admin%20UI-FluxGate%20Studio-orange.svg)](https://github.com/OpenFluxGate/fluxgate-studio)
@@ -79,40 +79,51 @@
 | **fluxgate-core**                | Bucket4j 통합을 포함한 핵심 Rate Limiting 엔진   |
 | **fluxgate-redis-ratelimiter**   | Lua 스크립트를 사용한 Redis 기반 분산 Rate Limiter |
 | **fluxgate-mongo-adapter**       | 동적 규칙 관리를 위한 MongoDB 어댑터               |
-| **fluxgate-spring-boot-starter** | Spring Boot 자동 설정 및 필터 지원              |
+| **fluxgate-spring-boot3-starter** | Spring Boot 3.x 자동 설정 (Java 17+, jakarta.servlet) |
+| **fluxgate-spring-boot2-starter** | Spring Boot 2.x 자동 설정 (Java 11+, javax.servlet) |
 | **fluxgate-testkit**             | 통합 테스트 유틸리티                            |
 | **fluxgate-samples**             | 다양한 사용 사례를 보여주는 샘플 애플리케이션              |
 
 ## 빠른 시작
 
 ### 사전 요구 사항
 
-- Java 21+
+- Java 11+
 - Maven 3.8+
 - Redis 6.0+ (분산 Rate Limiting용)
 - MongoDB 4.4+ (선택사항, 규칙 관리용)
 
 ### 1. 의존성 추가
 
 ```xml
+<!-- Spring Boot 3.x (Java 17+) -->
 <dependency>
     <groupId>io.github.openfluxgate</groupId>
-    <artifactId>fluxgate-spring-boot-starter</artifactId>
-    <version>0.2.0</version>
+    <artifactId>fluxgate-spring-boot3-starter</artifactId>
+    <version>0.3.3</version>
 </dependency>
 
+<!-- Spring Boot 2.x (Java 11+) -->
+<!--
+<dependency>
+    <groupId>io.github.openfluxgate</groupId>
+    <artifactId>fluxgate-spring-boot2-starter</artifactId>
+    <version>0.3.3</version>
+</dependency>
+-->
+
 <!-- For Redis-backed rate limiting -->
 <dependency>
 <groupId>io.github.openfluxgate</groupId>
 <artifactId>fluxgate-redis-ratelimiter</artifactId>
-<version>0.2.0</version>
+<version>0.3.3</version>
 </dependency>
 
 <!-- For MongoDB rule management (optional) -->
 <dependency>
 <groupId>io.github.openfluxgate</groupId>
 <artifactId>fluxgate-mongo-adapter</artifactId>
-<version>0.2.0</version>
+<version>0.3.3</version>
 </dependency>
 ```
 

README.md

@@ -1,7 +1,7 @@
 # FluxGate
 
-[![Java](https://img.shields.io/badge/Java-21%2B-blue.svg)](https://openjdk.org/)
-[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.3.x-brightgreen.svg)](https://spring.io/projects/spring-boot)
+[![Java](https://img.shields.io/badge/Java-11%2B-blue.svg)](https://openjdk.org/)
+[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.7.x%20%7C%203.x-brightgreen.svg)](https://spring.io/projects/spring-boot)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![Build](https://github.com/OpenFluxGate/fluxgate/actions/workflows/maven-ci.yml/badge.svg)](https://github.com/OpenFluxGate/fluxgate/actions)
 [![Admin UI](https://img.shields.io/badge/Admin%20UI-FluxGate%20Studio-orange.svg)](https://github.com/OpenFluxGate/fluxgate-studio)
@@ -78,40 +78,51 @@ English | [한국어](README.ko.md)
 | **fluxgate-core** | Core rate limiting engine with Bucket4j integration |
 | **fluxgate-redis-ratelimiter** | Redis-backed distributed rate limiter with Lua scripts |
 | **fluxgate-mongo-adapter** | MongoDB adapter for dynamic rule management |
-| **fluxgate-spring-boot-starter** | Spring Boot auto-configuration and filter support |
+| **fluxgate-spring-boot3-starter** | Spring Boot 3.x auto-configuration (Java 17+, jakarta.servlet) |
+| **fluxgate-spring-boot2-starter** | Spring Boot 2.x auto-configuration (Java 11+, javax.servlet) |
 | **fluxgate-testkit** | Integration testing utilities |
 | **fluxgate-samples** | Sample applications demonstrating various use cases |
 
 ## Quick Start
 
 ### Prerequisites
 
-- Java 21+
+- Java 11+
 - Maven 3.8+
 - Redis 6.0+ (for distributed rate limiting)
 - MongoDB 4.4+ (optional, for rule management)
 
 ### 1. Add Dependencies
 
 ```xml
+<!-- For Spring Boot 3.x (Java 17+) -->
 <dependency>
     <groupId>io.github.openfluxgate</groupId>
-    <artifactId>fluxgate-spring-boot-starter</artifactId>
-    <version>0.3.1</version>
+    <artifactId>fluxgate-spring-boot3-starter</artifactId>
+    <version>0.3.3</version>
 </dependency>
 
+<!-- For Spring Boot 2.x (Java 11+) -->
+<!--
+<dependency>
+    <groupId>io.github.openfluxgate</groupId>
+    <artifactId>fluxgate-spring-boot2-starter</artifactId>
+    <version>0.3.3</version>
+</dependency>
+-->
+
 <!-- For Redis-backed rate limiting -->
 <dependency>
     <groupId>io.github.openfluxgate</groupId>
     <artifactId>fluxgate-redis-ratelimiter</artifactId>
-    <version>0.3.1</version>
+    <version>0.3.3</version>
 </dependency>
 
 <!-- For MongoDB rule management (optional) -->
 <dependency>
     <groupId>io.github.openfluxgate</groupId>
     <artifactId>fluxgate-mongo-adapter</artifactId>
-    <version>0.3.1</version>
+    <version>0.3.3</version>
 </dependency>
 ```
 

fluxgate-control-support/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.github.openfluxgate</groupId>
         <artifactId>fluxgate</artifactId>
-        <version>0.3.1</version>
+        <version>0.3.3</version>
     </parent>
 
     <artifactId>fluxgate-control-support</artifactId>
@@ -18,6 +18,10 @@
     <name>FluxGate Control Support</name>
     <description>Support library for FluxGate Control Plane (Admin/Studio) - provides rule change notification capabilities</description>
 
+    <properties>
+        <skipJacocoForPom>false</skipJacocoForPom>
+    </properties>
+
     <dependencies>
         <!-- Lettuce Redis Client -->
         <dependency>

fluxgate-control-support/src/main/java/org/fluxgate/control/notify/RedisRuleChangeNotifier.java

@@ -11,6 +11,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -191,7 +192,10 @@ private void createStandaloneConnection() {
   private void createClusterConnection() {
     log.debug("Creating Redis cluster connection");
     List<RedisURI> uris =
-        Arrays.stream(redisUri.split(",")).map(String::trim).map(this::createRedisUri).toList();
+        Arrays.stream(redisUri.split(","))
+            .map(String::trim)
+            .map(this::createRedisUri)
+            .collect(Collectors.toList());
     redisClusterClient = RedisClusterClient.create(uris);
     clusterConnection = redisClusterClient.connect();
   }