From 3e90c14a537d7679b9d63bfcde5e65049ef8890e Mon Sep 17 00:00:00 2001
From: piomin <piotr.minkowski@gmail.com>
Date: Wed, 23 Apr 2025 09:18:41 +0200
Subject: [PATCH] fixes

---
 .circleci/config.yml                          |  4 ++--
 pom.xml                                       | 23 ++++++++-----------
 skaffold.yaml                                 |  7 +++---
 src/main/java/pl/piomin/model/CustomTask.java |  1 -
 .../server/SimpleCPUConsumeHandler.java       |  6 +++--
 .../piomin/server/SimpleDelayedHandler.java   |  5 ----
 6 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d2ea405..83c81c6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
           command: mvn verify sonar:sonar
 
 executors:
-  j19:
+  jdk:
     docker:
       - image: 'cimg/openjdk:21.0.6'
 
@@ -22,6 +22,6 @@ workflows:
   maven_test:
     jobs:
       - maven/test:
-          executor: j19
+          executor: jdk
       - build:
           context: SonarCloud
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d697e4a..8967dfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,19 +45,16 @@
 
     <build>
         <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.14.0</version>
-                    <configuration>
-                        <release>${java.version}</release>
-                        <compilerArgs>
-                            <arg>--enable-preview</arg>
-                        </compilerArgs>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
-                    </configuration>
-                </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.14.0</version>
+                <configuration>
+                    <release>${java.version}</release>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/skaffold.yaml b/skaffold.yaml
index e78ac0e..291a471 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v4beta5
 kind: Config
 metadata:
   name: sample-java-concurrency
@@ -21,6 +21,7 @@ build:
   local:
     push: true
 deploy:
-  kubectl:
-    manifests:
+  kubectl: {}
+manifests:
+  rawYaml:
     - k8s/deployment.yaml
diff --git a/src/main/java/pl/piomin/model/CustomTask.java b/src/main/java/pl/piomin/model/CustomTask.java
index 83fd448..d8bdade 100644
--- a/src/main/java/pl/piomin/model/CustomTask.java
+++ b/src/main/java/pl/piomin/model/CustomTask.java
@@ -2,7 +2,6 @@
 
 import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
 
 public record CustomTask(long startTime, String msg, long id) implements Delayed {
 
diff --git a/src/main/java/pl/piomin/server/SimpleCPUConsumeHandler.java b/src/main/java/pl/piomin/server/SimpleCPUConsumeHandler.java
index 670f514..0f320ca 100644
--- a/src/main/java/pl/piomin/server/SimpleCPUConsumeHandler.java
+++ b/src/main/java/pl/piomin/server/SimpleCPUConsumeHandler.java
@@ -8,17 +8,19 @@
 import java.math.BigInteger;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class SimpleCPUConsumeHandler implements HttpHandler {
 
-//    Logger LOG = Logger.getLogger("handler");
+    Logger LOG = Logger.getLogger("handler");
     AtomicLong i = new AtomicLong();
 
     @Override
     public void handle(HttpExchange exchange) throws IOException {
         new BigInteger(200, 3, new Random());
         String response = "Hello_" + i.incrementAndGet();
-//        LOG.log(Level.INFO, "(thread->{0}) {1}", new Object[] {Thread.currentThread(), response});
+        LOG.log(Level.INFO, "(thread->{0}) {1}", new Object[] {Thread.currentThread(), response});
         exchange.sendResponseHeaders(200, response.length());
         OutputStream os = exchange.getResponseBody();
         os.write(response.getBytes());
diff --git a/src/main/java/pl/piomin/server/SimpleDelayedHandler.java b/src/main/java/pl/piomin/server/SimpleDelayedHandler.java
index e13b965..c08c997 100644
--- a/src/main/java/pl/piomin/server/SimpleDelayedHandler.java
+++ b/src/main/java/pl/piomin/server/SimpleDelayedHandler.java
@@ -33,11 +33,6 @@ public void handle(HttpExchange t) throws IOException {
         if (withLock) {
             response = workers.get((int) (id.incrementAndGet() % workersCount)).doJob();
         } else {
-//            try {
-//                Thread.sleep(200);
-//            } catch (InterruptedException e) {
-//                throw new RuntimeException(e);
-//            }
             new BigInteger(500, 10, new Random());
             response = "Ping_" + id.incrementAndGet();
         }