diff --git a/felles/log/src/main/java/no/nav/vedtak/log/metrics/Controllable.java b/felles/log/src/main/java/no/nav/vedtak/log/metrics/Controllable.java index 8572e684f..07c1dcfca 100644 --- a/felles/log/src/main/java/no/nav/vedtak/log/metrics/Controllable.java +++ b/felles/log/src/main/java/no/nav/vedtak/log/metrics/Controllable.java @@ -1,9 +1,12 @@ package no.nav.vedtak.log.metrics; +@Deprecated(forRemoval = true) +/* + * @deprecated see no.nav.vedtak.server + */ public interface Controllable { void start(); void stop(); - } diff --git a/felles/log/src/main/java/no/nav/vedtak/log/metrics/LiveAndReadinessAware.java b/felles/log/src/main/java/no/nav/vedtak/log/metrics/LiveAndReadinessAware.java index 290d09c95..1abb630de 100644 --- a/felles/log/src/main/java/no/nav/vedtak/log/metrics/LiveAndReadinessAware.java +++ b/felles/log/src/main/java/no/nav/vedtak/log/metrics/LiveAndReadinessAware.java @@ -1,5 +1,9 @@ package no.nav.vedtak.log.metrics; +@Deprecated(forRemoval = true) +/* + * @deprecated see no.nav.vedtak.server + */ public interface LiveAndReadinessAware extends LivenessAware, ReadinessAware { } diff --git a/felles/log/src/main/java/no/nav/vedtak/log/metrics/LivenessAware.java b/felles/log/src/main/java/no/nav/vedtak/log/metrics/LivenessAware.java index 7c9c9b7b3..2b6a45076 100644 --- a/felles/log/src/main/java/no/nav/vedtak/log/metrics/LivenessAware.java +++ b/felles/log/src/main/java/no/nav/vedtak/log/metrics/LivenessAware.java @@ -1,5 +1,9 @@ package no.nav.vedtak.log.metrics; +@Deprecated(forRemoval = true) +/* + * @deprecated see no.nav.vedtak.server + */ public interface LivenessAware { boolean isAlive(); } diff --git a/felles/log/src/main/java/no/nav/vedtak/log/metrics/ReadinessAware.java b/felles/log/src/main/java/no/nav/vedtak/log/metrics/ReadinessAware.java index f30a7ec38..3ae35e3a5 100644 --- a/felles/log/src/main/java/no/nav/vedtak/log/metrics/ReadinessAware.java +++ b/felles/log/src/main/java/no/nav/vedtak/log/metrics/ReadinessAware.java @@ -1,5 +1,9 @@ package no.nav.vedtak.log.metrics; +@Deprecated(forRemoval = true) +/* + * @deprecated see no.nav.vedtak.server + */ public interface ReadinessAware { boolean isReady(); } diff --git a/felles/pom.xml b/felles/pom.xml index 70a27d075..c89de3d33 100644 --- a/felles/pom.xml +++ b/felles/pom.xml @@ -27,6 +27,7 @@ kontekst abac-kontekst auth-filter + server @@ -91,6 +92,11 @@ felles-oidc ${project.version} + + no.nav.foreldrepenger.felles + felles-server + ${project.version} + no.nav.foreldrepenger.felles felles-db diff --git a/felles/server/pom.xml b/felles/server/pom.xml new file mode 100644 index 000000000..150df00db --- /dev/null +++ b/felles/server/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + + no.nav.foreldrepenger.felles + felles + 0.0.0-SNAPSHOT + + + felles-server + Felles :: Server oppsett + jar + + diff --git a/felles/server/src/main/java/no/nav/vedtak/server/Controllable.java b/felles/server/src/main/java/no/nav/vedtak/server/Controllable.java new file mode 100644 index 000000000..58452a9db --- /dev/null +++ b/felles/server/src/main/java/no/nav/vedtak/server/Controllable.java @@ -0,0 +1,8 @@ +package no.nav.vedtak.server; + +public interface Controllable { + + void start(); + + void stop(); +} diff --git a/felles/server/src/main/java/no/nav/vedtak/server/LiveAndReadinessAware.java b/felles/server/src/main/java/no/nav/vedtak/server/LiveAndReadinessAware.java new file mode 100644 index 000000000..45849129e --- /dev/null +++ b/felles/server/src/main/java/no/nav/vedtak/server/LiveAndReadinessAware.java @@ -0,0 +1,4 @@ +package no.nav.vedtak.server; + +public interface LiveAndReadinessAware extends LivenessAware, ReadinessAware { +} diff --git a/felles/server/src/main/java/no/nav/vedtak/server/LivenessAware.java b/felles/server/src/main/java/no/nav/vedtak/server/LivenessAware.java new file mode 100644 index 000000000..12eb475f7 --- /dev/null +++ b/felles/server/src/main/java/no/nav/vedtak/server/LivenessAware.java @@ -0,0 +1,5 @@ +package no.nav.vedtak.server; + +public interface LivenessAware { + boolean isAlive(); +} diff --git a/felles/server/src/main/java/no/nav/vedtak/server/ReadinessAware.java b/felles/server/src/main/java/no/nav/vedtak/server/ReadinessAware.java new file mode 100644 index 000000000..a524e3b67 --- /dev/null +++ b/felles/server/src/main/java/no/nav/vedtak/server/ReadinessAware.java @@ -0,0 +1,5 @@ +package no.nav.vedtak.server; + +public interface ReadinessAware { + boolean isReady(); +}