Фикс сборки тестов

.github/workflows/maven-build.yml

@@ -20,12 +20,5 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      - name: Build with Maven (+ unit tests only)
-        run: mvn clean test
-
-      - name: Integration tests
-        run: mvn verify -P integration-tests
-        env:
-          GIGACHAT_API_CLIENT_ID: ${{ secrets.GIGACHAT_API_CLIENT_ID }}
-          GIGACHAT_API_CLIENT_SECRET: ${{ secrets.GIGACHAT_API_CLIENT_SECRET }}
-          GIGACHAT_API_SCOPE: ${{ secrets.GIGACHAT_API_SCOPE }}
+      - name: Build with Maven (unit tests only)
+        run: mvn clean test --no-transfer-progress

.github/workflows/maven-integration-tests.yml

@@ -0,0 +1,32 @@
+name: PR Merged build (with integration tests)
+
+on:
+  pull_request:
+    branches:
+      - main
+      - release/*
+    types: [closed]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Build with Maven (unit tests)
+        run: mvn clean test --no-transfer-progress
+
+      - name: Integration tests
+        run: mvn verify -P integration-tests --no-transfer-progress
+        env:
+          GIGACHAT_API_CLIENT_ID: ${{ secrets.GIGACHAT_API_CLIENT_ID }}
+          GIGACHAT_API_CLIENT_SECRET: ${{ secrets.GIGACHAT_API_CLIENT_SECRET }}
+          GIGACHAT_API_SCOPE: ${{ secrets.GIGACHAT_API_SCOPE }}

pom.xml

@@ -50,14 +50,14 @@
 
     <properties>
         <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <allure-bom.version>2.26.0</allure-bom.version>
-        <aspectj.version>1.9.22</aspectj.version>
+        <allure-bom.version>2.29.1</allure-bom.version>
+        <aspectj.version>1.9.24</aspectj.version>
         <spring-boot.version>3.4.5</spring-boot.version>
         <spring-ai.version>1.0.0</spring-ai.version>
-        <sslcontext-kickstart>8.3.5</sslcontext-kickstart>
+        <sslcontext-kickstart>8.3.7</sslcontext-kickstart>
+        <lombok.version>1.18.38</lombok.version>
 
         <maven.deploy.plugin.version>3.1.4</maven.deploy.plugin.version>
     </properties>
@@ -124,10 +124,26 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.14.0</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                    <release>${maven.compiler.release}</release>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.5</version>
+                <version>3.5.3</version>
                 <configuration>
                     <testFailureIgnore>false</testFailureIgnore>
                     <argLine>
@@ -162,7 +178,7 @@
             <plugin>
                 <groupId>io.qameta.allure</groupId>
                 <artifactId>allure-maven</artifactId>
-                <version>2.12.0</version>
+                <version>2.15.2</version>
                 <configuration>
                     <reportVersion>${allure-bom.version}</reportVersion>
                     <resultsDirectory>${project.build.directory}/allure-results</resultsDirectory>
@@ -172,7 +188,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.43.0</version>
+                <version>2.44.5</version>
                 <configuration>
                     <java>
                         <palantirJavaFormat/>
@@ -248,6 +264,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>3.5.3</version>
                         <executions>
                             <execution>
                                 <goals>

spring-ai-gigachat-example/pom.xml

@@ -85,6 +85,22 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.14.0</version>
+                    <configuration>
+                        <annotationProcessorPaths>
+                            <path>
+                                <groupId>org.projectlombok</groupId>
+                                <artifactId>lombok</artifactId>
+                                <version>${lombok.version}</version>
+                            </path>
+                        </annotationProcessorPaths>
+                        <release>${java.version}</release>
+                    </configuration>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-install-plugin</artifactId>

spring-ai-gigachat/src/main/java/chat/giga/springai/api/auth/GigaChatApiProperties.java

@@ -25,6 +25,8 @@ public class GigaChatApiProperties {
 
     private Resource clientCertificate;
     private Resource clientKey;
+
+    @Builder.Default
     private boolean unsafeSsl = false;
 
     public enum GigaChatApiScope {

spring-ai-gigachat/src/main/java/chat/giga/springai/api/chat/GigaChatApi.java

@@ -184,10 +184,10 @@ public ResponseEntity<ModelsResponse> models() {
 
     private Consumer<HttpHeaders> applyHeaders(@Nullable HttpHeaders headers) {
         return httpHeaders -> {
-            httpHeaders.add(HttpHeaders.USER_AGENT, USER_AGENT_SPRING_AI_GIGACHAT);
             if (!CollectionUtils.isEmpty(headers)) {
                 httpHeaders.addAll(headers);
             }
+            httpHeaders.set(HttpHeaders.USER_AGENT, USER_AGENT_SPRING_AI_GIGACHAT);
         };
     }
 }