Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
<dependency>
<groupId>io.getunleash</groupId>
<artifactId>unleash-client-java</artifactId>
<version>8.3.0</version>
<version>12.0.1</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
package no.nav.arbeidsgiver.tiltakrefusjon.featuretoggles


import io.getunleash.UnleashContext
import io.getunleash.strategy.Strategy
import org.springframework.stereotype.Component
import java.util.*

@Component
class ByEnvironmentStrategy : Strategy {
final val environment: String = Optional.ofNullable(System.getenv("MILJO")).orElse("local")

override fun getName(): String {
return "byEnvironment"
}

override fun isEnabled(parameters: Map<String, String>): Boolean {
return Optional.ofNullable(parameters)
.map { map: Map<String, String> -> map["miljø"] }
.map { env: String? -> Arrays.asList(*env!!.split(",").toTypedArray()).contains(environment) }
override fun isEnabled(
p0: Map<String, String>,
p1: UnleashContext
): Boolean {
return Optional.ofNullable(p0)
.map { map -> map["miljø"] }
.map { env: String? -> listOf(*env!!.split(",").toTypedArray()).contains(environment) }
.orElse(false)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package no.nav.arbeidsgiver.tiltakrefusjon.featuretoggles
import io.getunleash.MoreOperations
import io.getunleash.Unleash
import io.getunleash.UnleashContext
import io.getunleash.Variant
import io.getunleash.impactmetrics.MetricsAPI
import io.getunleash.variant.Variant
import java.util.function.BiPredicate


Expand Down Expand Up @@ -60,11 +61,11 @@ class FakeFakeUnleash : Unleash {
}
}

override fun getFeatureToggleNames(): List<String> {
return ArrayList(features.keys)
override fun more(): MoreOperations {
TODO("Not yet implemented")
}

override fun more(): MoreOperations {
override fun getImpactMetrics(): MetricsAPI {
TODO("Not yet implemented")
}

Expand All @@ -79,32 +80,4 @@ class FakeFakeUnleash : Unleash {
enableAll = false
features.clear()
}

fun resetAll() {
disableAll = false
enableAll = false
features.clear()
}

fun enable(vararg features: String) {
for (name in features) {
this.features[name] = true
}
}

fun disable(vararg features: String) {
for (name in features) {
this.features[name] = false
}
}

fun reset(vararg features: String) {
for (name in features) {
this.features.remove(name)
}
}

fun setVariant(t1: String, a: Variant) {
variants[t1] = a
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package no.nav.arbeidsgiver.tiltakrefusjon.featuretoggles


import io.getunleash.Variant
import io.getunleash.variant.Variant
import no.nav.arbeidsgiver.tiltakrefusjon.autorisering.InnloggetBrukerService
import no.nav.security.token.support.core.api.Unprotected
import org.springframework.beans.factory.annotation.Autowired
Expand All @@ -25,4 +25,4 @@ class FeatureToggleController @Autowired constructor(
fun variant(@RequestParam("feature") features: List<String?>): Map<String, Variant> {
return featureToggleService.hentVarianter(features, innloggetBrukerService.hentInnloggetSaksbehandler())
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package no.nav.arbeidsgiver.tiltakrefusjon.featuretoggles

import io.getunleash.Unleash
import io.getunleash.UnleashContext
import io.getunleash.Variant
import io.getunleash.variant.Variant
import io.micrometer.observation.annotation.Observed
import no.nav.arbeidsgiver.tiltakrefusjon.autorisering.InnloggetSaksbehandler
import org.springframework.beans.factory.annotation.Autowired
Expand Down Expand Up @@ -43,4 +43,4 @@ class FeatureToggleService @Autowired constructor(
builder.userId(identifikator)
return builder.build()
}
}
}