merge with lazy

funnyDevGirl · Aug 14, 2024 · 2bd5580 · 2bd5580
1 parent 5fcaf9f
commit 2bd5580
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
-      - name: Set up JDK 20
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           java-version: '21'

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.gradle.api.tasks.JavaExec
 
 plugins {
 	id("com.github.ben-manes.versions") version "0.48.0"
@@ -108,3 +109,19 @@ tasks.jacocoTestReport {
 		xml.required.set(true)
 	}
 }
+
+tasks.register<JavaExec>("runTaskManagerApp") {
+	classpath = sourceSets.main.get().runtimeClasspath
+	mainClass.set("hexlet.code.AppApplication")
+	args("--server.port=8080")
+}
+
+tasks.register<JavaExec>("runAnonymizerApp") {
+	classpath = sourceSets.main.get().runtimeClasspath
+	mainClass.set("io.project.Application")
+	args("--server.port=8081")
+}
+
+tasks.register("runAllApps") {
+	dependsOn("runTaskManagerApp", "runAnonymizerApp")
+}
diff --git a/src/main/java/hexlet/code/service/TaskService.java b/src/main/java/hexlet/code/service/TaskService.java
@@ -56,7 +56,7 @@ public TaskDTO findById(Long id) {
 
     public TaskDTO update(TaskUpdateDTO taskUpdateDTO, Long id) {
         var task = taskRepository.findByIdWithEagerUpload(id)
-                .orElseThrow(() -> new ResourceNotFoundException("Task With Id: " + id + " Not Found"));
+                    .orElseThrow(() -> new ResourceNotFoundException("Task With Id: " + id + " Not Found"));
 
         taskMapper.update(taskUpdateDTO, task);
 

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -5,7 +5,8 @@ spring:
     generate-ddl: true
     show-sql: true
     hibernate:
-      ddl-auto: create-drop
+      ddl-auto: create
+
   output:
     ansi:
       enabled: always