Fj 2024 lesson 14

.github/workflows/currency-app-workflow.yml

@@ -0,0 +1,80 @@
+name: Currency App Build
+
+on:
+  pull_request:
+    paths:
+      - .github/workflows/currency-app-workflow.yml
+      - currency-app/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Build
+    permissions:
+      contents: write
+      packages: write
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Jdk 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: "21"
+          distribution: "temurin"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
+
+      - name: Make gradlew executable
+        working-directory: currency-app
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle Wrapper
+        working-directory: currency-app
+        run: ./gradlew build -x checkstyleMain -x checkstyleTest
+
+      - id: jacoco
+        uses: madrapps/jacoco-report@v1.7.1
+        with:
+          paths: ${{ github.workspace }}/currency-app/build/reports/jacoco/test/jacocoTestReport.xml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          min-coverage-overall: 50
+          min-coverage-changed-files: 50
+          title: Code Coverage
+
+      - name: Login to Github Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: currency-app
+          push: true
+          tags: ghcr.io/daniil-vl/currency-app:latest
+
+  checkstyle:
+    name: checkstyle
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Jdk 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: "21"
+          distribution: "temurin"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
+
+      - name: Make gradlew executable
+        working-directory: currency-app
+        run: chmod +x ./gradlew
+
+      - run: ./gradlew checkstyleMain
+        working-directory: currency-app

.github/workflows/spring-app-workflow.yml

@@ -0,0 +1,80 @@
+name: Spring App Build
+
+on:
+  pull_request:
+    paths:
+      - .github/workflows/spring-app-workflow.yml
+      - spring-app/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Build
+    permissions:
+      contents: write
+      packages: write
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Jdk 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: "21"
+          distribution: "temurin"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
+
+      - name: Make gradlew executable
+        working-directory: spring-app
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle Wrapper
+        working-directory: spring-app
+        run: ./gradlew build -x checkstyleMain -x checkstyleTest
+
+      - id: jacoco
+        uses: madrapps/jacoco-report@v1.7.1
+        with:
+          paths: ${{ github.workspace }}/spring-app/build/reports/jacoco/test/jacocoTestReport.xml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          min-coverage-overall: 50
+          min-coverage-changed-files: 50
+          title: Code Coverage
+
+      - name: Login to Github Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: spring-app
+          push: true
+          tags: ghcr.io/daniil-vl/spring-app:latest
+
+  checkstyle:
+    name: checkstyle
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Jdk 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: "21"
+          distribution: "temurin"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
+
+      - name: Make gradlew executable
+        working-directory: spring-app
+        run: chmod +x ./gradlew
+
+      - run: ./gradlew checkstyleMain
+        working-directory: spring-app

config/checkstyle/checkstyle.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<!--
+    Checkstyle configuration
+-->
+<module name="Checker">
+
+    <property name="charset" value="UTF-8"/>
+    <property name="fileExtensions" value="java"/>
+
+    <module name="NewlineAtEndOfFile"/>
+
+    <module name="TreeWalker">
+        <module name="MissingOverride"/>
+
+        <!-- Imports -->
+        <module name="AvoidStarImport"/>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+    </module>
+
+</module>

currency-app/Dockerfile

@@ -0,0 +1,3 @@
+FROM openjdk:21
+ADD ./build/libs/currency-app-0.0.1-SNAPSHOT.jar app.jar
+ENTRYPOINT java -jar app.jar

currency-app/build.gradle

@@ -2,6 +2,8 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '3.3.4'
     id 'io.spring.dependency-management' version '1.1.6'
+    id 'jacoco'
+    id 'checkstyle'
 }
 
 group = 'ru.tbank'
@@ -60,4 +62,37 @@ dependencies {
 
 tasks.named('test') {
     useJUnitPlatform()
+    finalizedBy jacocoTestReport
 }
+
+checkstyle {
+    toolVersion = "10.12.4"
+    configFile file("../config/checkstyle/checkstyle.xml")
+    ignoreFailures = false
+    maxWarnings = 0
+    maxErrors = 0
+}
+
+checkstyleMain {
+    source = 'src/main/java'
+}
+
+checkstyleTest {
+    source = 'src/test/java'
+}
+
+jacocoTestReport {
+    dependsOn test
+
+    reports {
+        xml.required = true
+    }
+
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect(({
+            fileTree(dir: it, exclude: [
+                    "**/dto/**"
+            ])
+        }))))
+    }
+}

currency-app/src/main/java/ru/tbank/currencyapp/controller/CurrencyController.java

@@ -8,7 +8,11 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import ru.tbank.currencyapp.dto.CurrencyConvertRequestDTO;
 import ru.tbank.currencyapp.dto.CurrencyConvertedDTO;
 import ru.tbank.currencyapp.dto.CurrencyRateDTO;

currency-app/src/main/java/ru/tbank/currencyapp/dto/CurrencyRateDTO.java

@@ -6,4 +6,4 @@ public record CurrencyRateDTO(
         String currency,
         BigDecimal rate
 ) {
-}
+}

currency-app/src/main/java/ru/tbank/currencyapp/dto/cb/ValCursDTO.java

@@ -1,6 +1,10 @@
 package ru.tbank.currencyapp.dto.cb;
 
-import jakarta.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import lombok.ToString;
 
 import java.util.List;

currency-app/src/main/java/ru/tbank/currencyapp/validation/annotations/CurrencyIsValid.java

@@ -4,7 +4,11 @@
 import jakarta.validation.Payload;
 import ru.tbank.currencyapp.validation.validators.CurrencyValidator;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Documented
 @Constraint(validatedBy = {CurrencyValidator.class})

currency-app/src/test/java/ru/tbank/currencyapp/client/impl/CentralBankClientImplTest.java

@@ -27,7 +27,14 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Map;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.any;
+import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+
+//import static com.github.tomakehurst.wiremock.client.WireMock.*;
 
 @SpringBootTest(properties = {"spring.main.allow-bean-definition-overriding=true"})
 @WireMockTest
@@ -103,4 +110,4 @@ public WebClient webClient(WireMockServer server) {
         }
     }
 
-}
+}

currency-app/src/test/java/ru/tbank/currencyapp/controller/impl/CurrencyControllerImplTest.java

@@ -180,4 +180,4 @@ void givenUnavailableCentralBankApi_whenConvertCurrency_thenReturnApiErrorWithSe
                 );
     }
 
-}
+}

currency-app/src/test/java/ru/tbank/currencyapp/service/currency/impl/CurrencyServiceImplTest.java

@@ -61,7 +61,7 @@ void givenValidCurrenciesAndValidAmount_whenConvertCurrencies_thenSuccessfullyCo
         String fromCurrency = "USD";
         String toCurrency = "RUB";
         BigDecimal amount = new BigDecimal("3.0");
-        BigDecimal expected = new BigDecimal("90.0");
+        BigDecimal expected = new BigDecimal("90.000000");
 
         CurrencyConvertedDTO actual = currencyService.convertCurrencies(fromCurrency, toCurrency, amount);
 
@@ -79,4 +79,4 @@ void givenNonExistentCurrencyCode_whenConvertCurrencies_thenThrowCurrencyNotFoun
         Assertions.assertThrows(CurrencyNotFoundException.class, () -> currencyService.convertCurrencies(fromCurrency, toCurrency, amount));
     }
 
-}
+}

spring-app/Dockerfile

@@ -0,0 +1,3 @@
+FROM openjdk:21
+ADD ./build/libs/spring-app-0.0.1-SNAPSHOT.jar app.jar
+ENTRYPOINT java -jar app.jar

spring-app/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'org.springframework.boot' version '3.3.4'
     id 'io.spring.dependency-management' version '1.1.6'
     id 'jacoco'
+    id 'checkstyle'
 }
 
 group = 'ru.tbank'
@@ -50,9 +51,29 @@ tasks.named('test') {
     finalizedBy jacocoTestReport
 }
 
+checkstyle {
+    toolVersion = "10.12.4"
+    configFile file("../config/checkstyle/checkstyle.xml")
+    ignoreFailures = false
+    maxWarnings = 0
+    maxErrors = 0
+}
+
+checkstyleMain {
+    source = 'src/main/java'
+}
+
+checkstyleTest {
+    source = 'src/test/java'
+}
+
 jacocoTestReport {
     dependsOn test
 
+    reports {
+        xml.required = true
+    }
+
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect(({
             fileTree(dir: it, exclude: [

spring-app/src/main/java/ru/tbank/springapp/controller/CategoryController.java

@@ -1,7 +1,14 @@
 package ru.tbank.springapp.controller;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import ru.tbank.springapp.aspect.Timed;
 import ru.tbank.springapp.dto.CategoryDTO;
 import ru.tbank.springapp.model.Category;