release: merge dev into main for v1.2.0 production rollout

.github/workflows/ci.yml

@@ -0,0 +1,116 @@
+name: CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main", "dev" ]
+
+permissions:
+  contents: read
+
+jobs:
+
+  # ---------------------------------------------------------------------
+  # 1. Build + test on every push and every PR
+  # ---------------------------------------------------------------------
+  test:
+    name: Build & Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: '17'
+          cache: maven
+
+      - name: Make mvnw executable
+        run: chmod +x ./mvnw
+
+      - name: Run tests
+        # Tests run against the in-memory H2 DB and spring.cache.type=simple,
+        # so no Postgres/Redis service containers are needed here.
+        # WEATHER_API_KEY just needs to be non-empty; tests mock the HTTP client.
+        env:
+          WEATHER_API_KEY: dummy-ci-key
+        run: ./mvnw -B test
+
+      - name: Publish test report
+        if: always()
+        uses: dorny/test-reporter@v3
+        with:
+          name: Maven Tests
+          path: target/surefire-reports/*.xml
+          reporter: java-junit
+
+      - name: Upload JaCoCo coverage report
+        if: always()
+        uses: actions/upload-artifact@v7
+        with:
+          name: jacoco-report
+          path: target/site/jacoco/
+
+      - name: Build jar
+        env:
+          WEATHER_API_KEY: dummy-ci-key
+        run: ./mvnw -B package -DskipTests
+
+      - name: Upload jar artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: app-jar
+          path: target/*.jar
+
+  # ---------------------------------------------------------------------
+  # 2. Build + push a versioned image to Docker Hub
+  #    - runs ONLY on: pushes to main
+  #    - every push to main -> :<pom-version>  :latest
+  #    - pushes to dev, and all PRs -> this job does not run at all
+  #      (dev/PRs are still covered by the `test` job above)
+  # ---------------------------------------------------------------------
+  docker:
+    name: Build & Push Docker Image
+    needs: test
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+
+      - name: Read version from pom.xml
+        id: pom
+        run: |
+          chmod +x ./mvnw
+          VERSION=$(./mvnw -q -B help:evaluate -Dexpression=project.version -DforceStdout)
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata (tags)
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ secrets.DOCKERHUB_USERNAME }}/weatherviewer
+          tags: |
+            type=raw,value=${{ steps.pom.outputs.version }}
+            type=raw,value=latest
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

Dockerfile

@@ -9,8 +9,11 @@ RUN mvn package -DskipTests -B
 # Run stage
 FROM eclipse-temurin:17-jre-alpine
 WORKDIR /app
+RUN addgroup -S appgroup && adduser -S appuser -G appgroup
 COPY --from=build /app/target/*.jar app.jar
-EXPOSE 8080
+RUN chown -R appuser:appgroup /app
+USER appuser
+EXPOSE 8080 8081
 HEALTHCHECK --interval=15s --timeout=5s --start-period=30s --retries=3 \
-    CMD wget --no-verbose --tries=1 --spider http://localhost:8080/actuator/health || exit 1
-ENTRYPOINT ["java", "-jar", "app.jar"]
+    CMD wget --no-verbose --tries=1 --spider http://localhost:8081/actuator/health || exit 1
+ENTRYPOINT ["java", "-XX:+UseG1GC", "-XX:+UseContainerSupport", "-jar", "app.jar"]

docker-compose.yml

@@ -1,17 +1,21 @@
 services:
   weather_viewer:
+    build:
+      context: .
+      dockerfile: Dockerfile
     image: podllev/weather-viewer:latest
     container_name: weather_viewer
     restart: always
     ports:
       - "8080:8080"
+      - "8081:8081"
     env_file:
       - .env
     environment:
       SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/weather
       SPRING_DATA_REDIS_HOST: redis
     healthcheck:
-      test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/actuator/health" ]
+      test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8081/actuator/health" ]
       interval: 15s
       timeout: 5s
       retries: 3

pom.xml

@@ -10,9 +10,9 @@
     </parent>
     <groupId>com</groupId>
     <artifactId>WeatherViewer</artifactId>
-    <version>1.1.0-RELEASE</version>
+    <version>1.2.0</version>
     <name>WeatherViewer</name>
-    <description>A Spring Boot application for checking weather forecasts, managing favorite locations, and tracking request metrics with built-in rate limiting.</description>
+    <description>A Spring Boot application for checking weather forecasts, managing favorite locations, and tracking request metrics with built-in rate limiting. Supports English and Ukrainian locales.</description>
     <url/>
     <licenses>
         <license>
@@ -40,6 +40,7 @@
         <hibernate.core.version>6.6.7.Final</hibernate.core.version>
         <hibernate.jpa.version>1.0.1.Final</hibernate.jpa.version>
         <jacoco.version>0.8.12</jacoco.version>
+        <resilience4j.version>2.2.0</resilience4j.version>
         <mapstruct-processor.version>1.5.5.Final</mapstruct-processor.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
     </properties>
@@ -94,6 +95,23 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-tracing-bridge-brave</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.resilience4j</groupId>
+            <artifactId>resilience4j-spring-boot3</artifactId>
+            <version>${resilience4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -206,6 +224,26 @@
                             <goal>report</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>check</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <rule>
+                                    <element>BUNDLE</element>
+                                    <limits>
+                                        <limit>
+                                            <counter>LINE</counter>
+                                            <value>COVEREDRATIO</value>
+                                            <minimum>0.90</minimum>
+                                        </limit>
+                                    </limits>
+                                </rule>
+                            </rules>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

src/main/java/com/weatherviewer/WeatherViewerApplication.java

@@ -3,6 +3,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 import java.util.TimeZone;
 
@@ -12,10 +13,14 @@
  * Bootstraps the application context and enables Spring's caching
  * abstraction ({@link EnableCaching}), which backs the weather/forecast/
  * geocoding response caching in
- * {@link com.weatherviewer.service.integration.WeatherApiCache}.
+ * {@link com.weatherviewer.service.integration.WeatherApiCache}, and
+ * Spring's {@code @Async} support ({@link EnableAsync}), which backs
+ * asynchronous mail dispatch in
+ * {@link com.weatherviewer.service.impl.MailEventListener}.
  */
 @SpringBootApplication
 @EnableCaching
+@EnableAsync
 public class WeatherViewerApplication {
 
     /**

src/main/java/com/weatherviewer/config/AppConfig.java

@@ -1,14 +1,19 @@
 package com.weatherviewer.config;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
 import org.springframework.security.web.DefaultRedirectStrategy;
 import org.springframework.security.web.RedirectStrategy;
 import org.springframework.web.client.RestClient;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 
 import java.util.Locale;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * General-purpose application beans that don't belong to a more specific
@@ -17,10 +22,22 @@
 @Configuration
 public class AppConfig {
 
-    /** HTTP client used by {@link com.weatherviewer.service.integration.WeatherApiClient} to call OpenWeatherMap. */
+    /**
+     * HTTP client used by {@link com.weatherviewer.service.integration.WeatherApiClient} to
+     * call OpenWeatherMap. Explicit connect/read timeouts are required here: without them the
+     * underlying JDK client factory has no default timeout, so a hung or slow OpenWeatherMap
+     * response would block the calling request thread indefinitely and, under load, exhaust
+     * the server's thread pool.
+     */
     @Bean
-    public RestClient restClient(RestClient.Builder restClientBuilder) {
-        return restClientBuilder.build();
+    public RestClient restClient(
+            RestClient.Builder restClientBuilder,
+            @Value("${weather.api.connect-timeout-ms:3000}") int connectTimeoutMs,
+            @Value("${weather.api.read-timeout-ms:5000}") int readTimeoutMs) {
+        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+        requestFactory.setConnectTimeout(connectTimeoutMs);
+        requestFactory.setReadTimeout(readTimeoutMs);
+        return restClientBuilder.requestFactory(requestFactory).build();
     }
 
     /** Default Spring Security redirect strategy, used by {@link com.weatherviewer.security.CustomAuthSuccessHandler}. */
@@ -37,4 +54,40 @@ public LocaleResolver localeResolver() {
         return slr;
     }
 
+    /**
+     * Dedicated, bounded thread pool used by
+     * {@link com.weatherviewer.controller.HomeController} to fetch weather
+     * for a user's saved locations concurrently.
+     * <p>
+     * Deliberately separate from the JVM-wide common {@code ForkJoinPool}
+     * (what a bare {@code parallelStream()} would use): that pool is shared
+     * with unrelated parallel streams elsewhere in the JVM and has no
+     * request-scoped bound, so a user with many saved locations could
+     * starve it for everyone. Sized via {@code weather.dashboard.fetch-pool-size}
+     * (default 20) and shut down automatically on context close.
+     */
+    @Bean(destroyMethod = "shutdown")
+    public ExecutorService weatherFetchExecutor(
+            @Value("${weather.dashboard.fetch-pool-size:20}") int poolSize) {
+        return Executors.newFixedThreadPool(poolSize, new CustomizableThreadFactory("weather-fetch-"));
+    }
+
+    /**
+     * Dedicated, bounded thread pool used by
+     * {@link com.weatherviewer.service.impl.MailEventListener} to send
+     * verification/password-reset emails off the request thread.
+     * <p>
+     * Kept separate from {@link #weatherFetchExecutor} for the same reason
+     * that one is kept separate from the JVM-wide common pool: a burst of
+     * sign-ups or reset requests (each possibly retried a few times against
+     * a slow SMTP server) shouldn't be able to starve weather-dashboard
+     * fetches, or vice versa. Sized via {@code mail.async.pool-size}
+     * (default 5) and shut down automatically on context close.
+     */
+    @Bean(name = "mailTaskExecutor", destroyMethod = "shutdown")
+    public ExecutorService mailTaskExecutor(
+            @Value("${mail.async.pool-size:5}") int poolSize) {
+        return Executors.newFixedThreadPool(poolSize, new CustomizableThreadFactory("mail-send-"));
+    }
+
 }