Bom bom (#883)

* fjernet unødvendig bom * bruk fp-konfig, flernet duplikat kode i felles * litt flere records * ny interface kombinerer liveness og redainess Co-authored-by: Jan-Olav Eide <[email protected]>
navikt · Jul 1, 2021 · 2c62ba9 · 2c62ba9
1 parent bfc470d
commit 2c62ba9
Show file tree

Hide file tree

Showing 39 changed files with 40 additions and 1,433 deletions.
diff --git a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/PepImpl.java b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/PepImpl.java
@@ -15,7 +15,7 @@
 import javax.enterprise.inject.Default;
 import javax.inject.Inject;
 
-import no.nav.vedtak.konfig.KonfigVerdi;
+import no.nav.foreldrepenger.konfig.KonfigVerdi;
 
 @Default
 @ApplicationScoped

diff --git a/felles/log/src/main/java/no/nav/vedtak/log/audit/Auditlogger.java b/felles/log/src/main/java/no/nav/vedtak/log/audit/Auditlogger.java
@@ -8,7 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import no.nav.vedtak.konfig.KonfigVerdi;
+import no.nav.foreldrepenger.konfig.KonfigVerdi;
 
 /**
  * Auditlogging til Arcsight i Common Event Format (CEF). Dette er en erstatning for sporingslog.

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
@@ -0,0 +1,5 @@
+package no.nav.vedtak.log.metrics;
+
+public interface LiveAndReadinessAware extends LivenessAware, ReadinessAware {
+
+}
diff --git a/...ak/util/env/ConfidentialMarkerFilter.java → ...ak/log/util/ConfidentialMarkerFilter.java b/...ak/util/env/ConfidentialMarkerFilter.java → ...ak/log/util/ConfidentialMarkerFilter.java
@@ -1,4 +1,4 @@
-package no.nav.vedtak.util.env;
+package no.nav.vedtak.log.util;
 
 import static ch.qos.logback.core.spi.FilterReply.DENY;
 import static ch.qos.logback.core.spi.FilterReply.NEUTRAL;
@@ -10,6 +10,7 @@
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.turbo.MarkerFilter;
 import ch.qos.logback.core.spi.FilterReply;
+import no.nav.foreldrepenger.konfig.Environment;
 
 public class ConfidentialMarkerFilter extends MarkerFilter {
 

diff --git a/felles/util/src/main/java/no/nav/vedtak/konfig/ApplicationPropertiesKonfigProvider.java b/felles/util/src/main/java/no/nav/vedtak/konfig/ApplicationPropertiesKonfigProvider.java
diff --git a/felles/util/src/main/java/no/nav/vedtak/konfig/DefaultValueKonfigProvider.java b/felles/util/src/main/java/no/nav/vedtak/konfig/DefaultValueKonfigProvider.java
diff --git a/felles/util/src/main/java/no/nav/vedtak/konfig/EnvPropertiesKonfigVerdiProvider.java b/felles/util/src/main/java/no/nav/vedtak/konfig/EnvPropertiesKonfigVerdiProvider.java