Updated dependencies, build requires java 17

Author: brianhks

conf/application.conf

@@ -1,8 +1,8 @@
 # Application configuration file. See https://github.com/typesafehub/config/blob/master/HOCON.md for more details
 HOSTNAME = "bh-laptop"
 
-#topic_monitor.bootstrap_servers = "home-linux:9092"
-topic_monitor.bootstrap_servers = "localhost:9092"
+topic_monitor.bootstrap_servers = "home-linux:9092"
+#topic_monitor.bootstrap_servers = "localhost:9092"
 
 topic_monitor.application_id = "kafka_monitor"
 

pom.xml

@@ -15,10 +15,10 @@
     <!-- Startup class -->
     <application.class>app.App</application.class>
 
-    <jooby.version>2.9.4</jooby.version>
+    <jooby.version>3.0.9</jooby.version>
 
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <maven.compiler.parameters>true</maven.compiler.parameters>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.3</version>
+      <version>1.5.3</version>
     </dependency>
 
     <dependency>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>
-      <version>2.7.0</version>
+      <version>3.6.1</version>
     </dependency>
 
     <dependency>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>org.kairosdb</groupId>
       <artifactId>metrics4j</artifactId>
-      <version>0.17.0</version>
+      <version>1.0.0</version>
     </dependency>
 
     <!-- Tests -->
@@ -88,6 +88,14 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
+      <version>4.12.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>5.2.0</version>
       <scope>test</scope>
     </dependency>
 

src/main/java/app/App.java

@@ -1,7 +1,6 @@
 package app;
 
 import io.jooby.Jooby;
-import io.jooby.di.GuiceModule;
 import org.kairosdb.kafka.monitor.KTMGuiceModule;
 import org.kairosdb.kafka.monitor.KafkaModule;
 import org.kairosdb.kafka.monitor.MetricsTrigger;

src/main/java/org/kairosdb/kafka/monitor/DurationConfigModule.java

@@ -1,23 +1,13 @@
 package org.kairosdb.kafka.monitor;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Binder;
-import com.google.inject.Key;
-import com.google.inject.Module;
-import com.google.inject.name.Named;
 import com.google.inject.name.Names;
-import com.google.inject.util.Types;
 import com.typesafe.config.Config;
-import com.typesafe.config.ConfigValue;
 import io.jooby.Jooby;
 
-import java.lang.reflect.Type;
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 public class DurationConfigModule extends AbstractModule
 {

src/main/java/org/kairosdb/kafka/monitor/KTMGuiceModule.java

@@ -8,8 +8,8 @@
 import io.jooby.Environment;
 import io.jooby.Extension;
 import io.jooby.Jooby;
-import io.jooby.di.GuiceModule;
-import io.jooby.di.JoobyModule;
+import io.jooby.guice.GuiceModule;
+import io.jooby.guice.JoobyModule;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;

src/main/java/org/kairosdb/kafka/monitor/KafkaModule.java

@@ -6,12 +6,12 @@
 import com.google.inject.matcher.Matchers;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigValue;
+import jakarta.inject.Named;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.serialization.Serdes;
 import org.kairosdb.kafka.monitor.util.ConfigurationTypeListener;
 
-import javax.inject.Named;
 import java.util.Map;
 import java.util.Properties;
 

src/main/java/org/kairosdb/kafka/monitor/OffsetListenerService.java

@@ -1,7 +1,8 @@
 package org.kairosdb.kafka.monitor;
 
 import com.google.common.base.Stopwatch;
-import com.google.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Inject;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.PartitionInfo;
@@ -14,7 +15,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Named;
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.TimeUnit;

src/main/java/org/kairosdb/kafka/monitor/PartitionedOffsetReader.java

@@ -1,6 +1,7 @@
 package org.kairosdb.kafka.monitor;
 
-import com.google.inject.Inject;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -14,7 +15,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Named;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.HashSet;

src/main/java/org/kairosdb/kafka/monitor/RawOffsetReader.java

@@ -1,6 +1,7 @@
 package org.kairosdb.kafka.monitor;
 
-import com.google.inject.Inject;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -15,7 +16,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Named;
 import java.nio.ByteBuffer;
 import java.time.Duration;
 import java.util.Collections;
@@ -127,14 +127,13 @@ protected int readTopic()
 			{
 				Offset offset = Offset.createFromBytes(record.key().get(), record.value().get());
 
-				//todo check if our own offsets
-				//todo !value.getTopic().equals(OFFSET_TOPIC)
+				//check if our own offsets
 				if (m_monitorConfig.isExcludeMonitorOffsets() && offset.getGroup().startsWith(m_monitorConfig.getApplicationId()))
 				{
 					continue;
 				}
 
-				//System.out.println(offset.getTopic());
+				System.out.println("Topic: "+offset.getTopic()+" Partition: "+offset.getPartition()+" Offset: "+offset.getOffset());
 				//Filter out expired offsets.  We can still read them long after they have expired
 				//System.out.println(offset.getCommitTime() + " " + expireTime);
 				if (offset.getCommitTime() > expireTime)

src/test/java/app/IntegrationTest.java

@@ -1,6 +1,5 @@
 package app;
 
-import io.jooby.JoobyTest;
 import io.jooby.StatusCode;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;

src/test/java/app/UnitTest.java

@@ -1,6 +1,5 @@
 package app;
 
-import io.jooby.MockRouter;
 import io.jooby.StatusCode;
 import org.junit.jupiter.api.Test;