feat: ny prosess task rest. Bruk felles-server (#2614)

Author: mrsladek

domenetjenester/vedtak/pom.xml

@@ -44,6 +44,10 @@
             <groupId>no.nav.foreldrepenger.felles.integrasjon</groupId>
             <artifactId>kafka-properties</artifactId>
         </dependency>
+        <dependency>
+            <groupId>no.nav.foreldrepenger.felles</groupId>
+            <artifactId>felles-server</artifactId>
+        </dependency>
 
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>

domenetjenester/vedtak/src/main/java/no/nav/foreldrepenger/abakus/vedtak/kafka/VedtakConsumer.java

@@ -1,23 +1,24 @@
 package no.nav.foreldrepenger.abakus.vedtak.kafka;
 
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import no.nav.vedtak.felles.integrasjon.kafka.KafkaConsumerManager;
-import no.nav.vedtak.log.metrics.Controllable;
-import no.nav.vedtak.log.metrics.LiveAndReadinessAware;
+import no.nav.vedtak.server.Controllable;
+import no.nav.vedtak.server.LiveAndReadinessAware;
 
 @ApplicationScoped
 public class VedtakConsumer implements LiveAndReadinessAware, Controllable {
 
     private static final Logger LOG = LoggerFactory.getLogger(VedtakConsumer.class);
 
     private KafkaConsumerManager<String, String> kcm;
-    private String topic;
 
     VedtakConsumer() {
+        // CDI proxy
     }
 
     @Inject

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.felles</groupId>
         <artifactId>fp-bom</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2</version>
     </parent>
 
 	<groupId>no.nav.foreldrepenger.abakus</groupId>
@@ -36,7 +36,7 @@
         <kontrakt.java.version>21</kontrakt.java.version>
 
 		<felles.version>7.4.3</felles.version>
-		<prosesstask.version>5.0.21</prosesstask.version>
+		<prosesstask.version>5.1.0</prosesstask.version>
 		<kontrakter.version>9.2.0</kontrakter.version>
         <tidsserie.version>2.7.1</tidsserie.version>
 
@@ -54,7 +54,7 @@
             <dependency>
                 <groupId>no.nav.foreldrepenger.felles</groupId>
                 <artifactId>fp-bom</artifactId>
-                <version>3.6.1</version>
+                <version>3.6.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

web/pom.xml

@@ -63,6 +63,10 @@
             <groupId>no.nav.foreldrepenger.felles</groupId>
             <artifactId>felles-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>no.nav.foreldrepenger.felles</groupId>
+            <artifactId>felles-server</artifactId>
+        </dependency>
 
         <!-- Database håndtering -->
         <dependency>

web/src/main/java/no/nav/foreldrepenger/abakus/app/healthcheck/DatabaseHealthCheck.java

@@ -9,7 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import no.nav.vedtak.log.metrics.LiveAndReadinessAware;
+import no.nav.vedtak.server.LiveAndReadinessAware;
 
 @ApplicationScoped
 public class DatabaseHealthCheck implements LiveAndReadinessAware {

web/src/main/java/no/nav/foreldrepenger/abakus/app/healthcheck/HealthCheckRestService.java

@@ -15,13 +15,15 @@
 import jakarta.ws.rs.core.CacheControl;
 import jakarta.ws.rs.core.Response;
 
+import no.nav.vedtak.server.LivenessAware;
+
+import no.nav.vedtak.server.ReadinessAware;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.swagger.v3.oas.annotations.Operation;
 import no.nav.foreldrepenger.abakus.app.tjenester.ApplicationServiceStarter;
-import no.nav.vedtak.log.metrics.LivenessAware;
-import no.nav.vedtak.log.metrics.ReadinessAware;
 
 @Path("/health")
 @Produces(TEXT_PLAIN)

web/src/main/java/no/nav/foreldrepenger/abakus/app/tjenester/ApplicationServiceStarter.java

@@ -7,14 +7,15 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import no.nav.vedtak.server.Controllable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Any;
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
-import no.nav.vedtak.log.metrics.Controllable;
 
 /**
  * Initialiserer applikasjontjenester som implementer AppServiceHandler

web/src/test/java/no/nav/foreldrepenger/abakus/app/healthcheck/HealthCheckRestServiceTest.java

@@ -8,14 +8,16 @@
 
 import java.util.List;
 
+import no.nav.vedtak.server.LivenessAware;
+
+import no.nav.vedtak.server.ReadinessAware;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 
 import no.nav.foreldrepenger.abakus.app.tjenester.ApplicationServiceStarter;
-import no.nav.vedtak.log.metrics.LivenessAware;
-import no.nav.vedtak.log.metrics.ReadinessAware;
 
 import org.mockito.junit.jupiter.MockitoExtension;
 

web/src/test/java/no/nav/foreldrepenger/abakus/app/tjenester/ApplicationServiceStarterTest.java

@@ -2,13 +2,14 @@
 
 import static org.mockito.Mockito.verify;
 
+import no.nav.vedtak.server.Controllable;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import no.nav.vedtak.log.metrics.Controllable;
 
 @ExtendWith(MockitoExtension.class)
 class ApplicationServiceStarterTest {