Skip to content

Commit 2094d9d

Browse files
hestadhestad
committed
Rename behandling:domain til behandling:common
Måtte navngi og exclude en del prosjekter som taes inn implisitt av gradle
1 parent b165b66 commit 2094d9d

File tree

43 files changed

+51
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+51
-27
lines changed

Diff for: ‎behandling/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tasks.named<Jar>("jar") {
2+
enabled = false
3+
archiveBaseName.set("behandling")
4+
}

Diff for: ‎behandling/common/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tasks.named<Jar>("jar") {
2+
enabled = false
3+
archiveBaseName.set("behandling-common")
4+
}

Diff for: ‎behandling/domain/build.gradle.kts renamed to ‎behandling/common/domain/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ dependencies {
1414
}
1515

1616
tasks.named<Jar>("jar") {
17-
archiveBaseName.set("behandling-domain")
17+
archiveBaseName.set("behandling-common-domain")
1818
}

Diff for: ‎behandling/domain/src/main/kotlin/behandling/domain/Behandling.kt renamed to ‎behandling/common/domain/src/main/kotlin/behandling/domain/Behandling.kt

File renamed without changes.

Diff for: ‎behandling/domain/src/main/kotlin/behandling/domain/BehandlingMetrics.kt renamed to ‎behandling/common/domain/src/main/kotlin/behandling/domain/BehandlingMetrics.kt

File renamed without changes.

Diff for: ‎behandling/domain/src/main/kotlin/behandling/domain/Saksbehandlingshistorikk.kt renamed to ‎behandling/common/domain/src/main/kotlin/behandling/domain/Saksbehandlingshistorikk.kt

File renamed without changes.

Diff for: ‎behandling/domain/src/main/kotlin/behandling/domain/Stønadsbehandling.kt renamed to ‎behandling/common/domain/src/main/kotlin/behandling/domain/Stønadsbehandling.kt

File renamed without changes.

Diff for: ‎behandling/domain/src/main/kotlin/behandling/domain/UnderkjennAttesteringsgrunnBehandling.kt renamed to ‎behandling/common/domain/src/main/kotlin/behandling/domain/UnderkjennAttesteringsgrunnBehandling.kt

File renamed without changes.

Diff for: ‎behandling/domain/src/main/kotlin/behandling/domain/VurderAvslagGrunnetBeregning.kt renamed to ‎behandling/common/domain/src/main/kotlin/behandling/domain/VurderAvslagGrunnetBeregning.kt

File renamed without changes.

Diff for: ‎behandling/domain/src/main/kotlin/behandling/domain/dokument/DokumenttilstandEx.kt renamed to ‎behandling/common/domain/src/main/kotlin/behandling/domain/dokument/DokumenttilstandEx.kt

File renamed without changes.

Diff for: ‎behandling/domain/src/main/kotlin/behandling/domain/fradrag/LeggTilFradragsgrunnlagRequest.kt renamed to ‎behandling/common/domain/src/main/kotlin/behandling/domain/fradrag/LeggTilFradragsgrunnlagRequest.kt

File renamed without changes.

Diff for: ‎behandling/domain/src/test/resources/logback-test.xml renamed to ‎behandling/common/domain/src/test/resources/logback-test.xml

File renamed without changes.

Diff for: ‎behandling/domain/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker renamed to ‎behandling/common/domain/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

File renamed without changes.

Diff for: ‎behandling/klage/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tasks.named<Jar>("jar") {
2+
enabled = false
3+
archiveBaseName.set("behandling-klage")
4+
}

Diff for: ‎behandling/regulering/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tasks.named<Jar>("jar") {
2+
enabled = false
3+
archiveBaseName.set("behandling-regulering")
4+
}

Diff for: ‎behandling/revurdering/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tasks.named<Jar>("jar") {
2+
enabled = false
3+
archiveBaseName.set("behandling-revurdering")
4+
}

Diff for: ‎behandling/revurdering/domain/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22
implementation(project(":common:domain"))
3-
implementation(project(":behandling:domain"))
3+
implementation(project(":behandling:common:domain"))
44

55
implementation(project(":vilkår:vurderinger:domain"))
66
implementation(project(":common:domain"))

Diff for: ‎behandling/revurdering/presentation/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dependencies {
22
implementation(project(":common:domain"))
33
implementation(project(":common:infrastructure"))
44
implementation(project(":common:presentation"))
5-
implementation(project(":behandling:domain"))
5+
implementation(project(":behandling:common:domain"))
66
implementation(project(":behandling:revurdering:domain"))
77

88
implementation(project(":vilkår:vurderinger:domain"))

Diff for: ‎behandling/søknadsbehandling/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tasks.named<Jar>("jar") {
2+
enabled = false
3+
archiveBaseName.set("behandling-søknadsbehandling")
4+
}

Diff for: ‎behandling/søknadsbehandling/domain/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
implementation(project(":behandling:domain"))
2+
implementation(project(":behandling:common:domain"))
33
implementation(project(":beregning"))
44
implementation(project(":common:domain"))
55
implementation(project(":common:domain"))

Diff for: ‎domain/src/main/kotlin/no/nav/su/se/bakover/domain/søknadsbehandling/avbryt/KunneIkkeLukkeSøknadsbehandling.kt renamed to ‎behandling/søknadsbehandling/domain/src/main/kotlin/behandling/søknadsbehandling/domain/avbryt/KunneIkkeLukkeSøknadsbehandling.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package no.nav.su.se.bakover.domain.søknadsbehandling.avbryt
1+
package behandling.søknadsbehandling.domain.avbryt
22

33
sealed interface KunneIkkeLukkeSøknadsbehandling {
44
data object KanIkkeLukkeEnAlleredeLukketSøknadsbehandling : KunneIkkeLukkeSøknadsbehandling

Diff for: ‎behandling/søknadsbehandling/presentation/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dependencies {
22
implementation(project(":common:domain"))
33
implementation(project(":common:infrastructure"))
44
implementation(project(":common:presentation"))
5-
implementation(project(":behandling:domain"))
5+
implementation(project(":behandling:common:domain"))
66
implementation(project(":behandling:søknadsbehandling:domain"))
77

88
implementation(project(":vilkår:vurderinger:domain"))

Diff for: ‎client/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies {
1111
implementation(project(":tilbakekreving:domain"))
1212
implementation(project(":tilbakekreving:infrastructure"))
1313
implementation(project(":person:domain"))
14-
implementation(project(":behandling:domain"))
14+
implementation(project(":behandling:common:domain"))
1515
implementation(project(":satser"))
1616
implementation(project(":beregning"))
1717
implementation(project(":vilkår:uføre:domain"))

Diff for: ‎database/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
implementation(project(":behandling:domain"))
2+
implementation(project(":behandling:common:domain"))
33
implementation(project(":behandling:revurdering:domain"))
44
implementation(project(":behandling:søknadsbehandling:domain"))
55
implementation(project(":beregning"))

Diff for: ‎domain/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
implementation(project(":behandling:domain"))
2+
implementation(project(":behandling:common:domain"))
33
implementation(project(":behandling:regulering:domain"))
44
implementation(project(":behandling:revurdering:domain"))
55
implementation(project(":behandling:søknadsbehandling:domain"))

Diff for: ‎domain/src/main/kotlin/no/nav/su/se/bakover/domain/søknadsbehandling/LukketSøknadsbehandling.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package no.nav.su.se.bakover.domain.søknadsbehandling
33
import arrow.core.Either
44
import arrow.core.left
55
import arrow.core.right
6+
import behandling.søknadsbehandling.domain.avbryt.KunneIkkeLukkeSøknadsbehandling
67
import no.nav.su.se.bakover.common.domain.Avsluttet
78
import no.nav.su.se.bakover.common.domain.Stønadsperiode
89
import no.nav.su.se.bakover.common.domain.oppgave.OppgaveId
@@ -11,7 +12,6 @@ import no.nav.su.se.bakover.common.ident.NavIdentBruker
1112
import no.nav.su.se.bakover.common.tid.Tidspunkt
1213
import no.nav.su.se.bakover.domain.søknad.LukkSøknadCommand
1314
import no.nav.su.se.bakover.domain.søknad.Søknad
14-
import no.nav.su.se.bakover.domain.søknadsbehandling.avbryt.KunneIkkeLukkeSøknadsbehandling
1515
import no.nav.su.se.bakover.domain.søknadsbehandling.grunnlag.KunneIkkeLeggeTilSkattegrunnlag
1616
import no.nav.su.se.bakover.domain.søknadsbehandling.stønadsperiode.Aldersvurdering
1717
import vilkår.vurderinger.domain.EksterneGrunnlagSkatt

Diff for: ‎domain/src/main/kotlin/no/nav/su/se/bakover/domain/søknadsbehandling/Søknadsbehandling.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import behandling.domain.BehandlingMedOppgave
66
import behandling.domain.MedSaksbehandlerHistorikk
77
import behandling.søknadsbehandling.domain.GrunnlagsdataOgVilkårsvurderingerSøknadsbehandling
88
import behandling.søknadsbehandling.domain.VilkårsvurderingerSøknadsbehandling
9+
import behandling.søknadsbehandling.domain.avbryt.KunneIkkeLukkeSøknadsbehandling
910
import beregning.domain.Beregning
1011
import no.nav.su.se.bakover.common.domain.Stønadsperiode
1112
import no.nav.su.se.bakover.common.domain.attestering.Attesteringshistorikk
1213
import no.nav.su.se.bakover.common.domain.oppgave.OppgaveId
1314
import no.nav.su.se.bakover.common.ident.NavIdentBruker
1415
import no.nav.su.se.bakover.domain.søknad.LukkSøknadCommand
1516
import no.nav.su.se.bakover.domain.søknad.Søknad
16-
import no.nav.su.se.bakover.domain.søknadsbehandling.avbryt.KunneIkkeLukkeSøknadsbehandling
1717
import no.nav.su.se.bakover.domain.søknadsbehandling.grunnlag.KunneIkkeLeggeTilSkattegrunnlag
1818
import no.nav.su.se.bakover.domain.søknadsbehandling.stønadsperiode.Aldersvurdering
1919
import vilkår.vurderinger.domain.EksterneGrunnlagSkatt

Diff for: ‎domain/src/test/kotlin/no/nav/su/se/bakover/domain/søknadsbehandling/lukk/LukketSøknadsbehandlingTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package no.nav.su.se.bakover.domain.søknadsbehandling.lukk
22

33
import arrow.core.left
44
import arrow.core.right
5+
import behandling.søknadsbehandling.domain.avbryt.KunneIkkeLukkeSøknadsbehandling
56
import io.kotest.matchers.shouldBe
67
import no.nav.su.se.bakover.domain.søknad.Søknad
78
import no.nav.su.se.bakover.domain.søknadsbehandling.LukketSøknadsbehandling
89
import no.nav.su.se.bakover.domain.søknadsbehandling.SøknadsbehandlingsHandling
9-
import no.nav.su.se.bakover.domain.søknadsbehandling.avbryt.KunneIkkeLukkeSøknadsbehandling
1010
import no.nav.su.se.bakover.test.bortfallSøknad
1111
import no.nav.su.se.bakover.test.fixedTidspunkt
1212
import no.nav.su.se.bakover.test.nySøknadsbehandlingUtenStønadsperiode

Diff for: ‎kontrollsamtale/application/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies {
66
implementation(project(":person:domain"))
77
implementation(project(":oppgave:domain"))
88
implementation(project(":vedtak:domain"))
9-
implementation(project(":behandling:domain"))
9+
implementation(project(":behandling:common:domain"))
1010

1111
testImplementation(project(":test-common"))
1212
// Mockito

Diff for: ‎kontrollsamtale/domain/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dependencies {
33
implementation(project(":domain"))
44
implementation(project(":dokument:domain"))
55
implementation(project(":vedtak:domain"))
6-
implementation(project(":behandling:domain"))
6+
implementation(project(":behandling:common:domain"))
77
// TODO jah: Try to remove this dependency
88
implementation(project(":økonomi:domain"))
99
testImplementation(project(":test-common"))

Diff for: ‎service/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
implementation(project(":behandling:domain"))
2+
implementation(project(":behandling:common:domain"))
33
implementation(project(":behandling:regulering:domain"))
44
implementation(project(":behandling:revurdering:domain"))
55
implementation(project(":behandling:søknadsbehandling:domain"))

Diff for: ‎settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pluginManagement {
77
rootProject.name = "su-se-bakover"
88

99
include("application")
10-
include("behandling:domain")
10+
include("behandling:common:domain")
1111
include("behandling:klage:application")
1212
include("behandling:klage:domain")
1313
include("behandling:klage:infrastructure")

Diff for: ‎statistikk/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
implementation(project(":behandling:domain"))
2+
implementation(project(":behandling:common:domain"))
33
implementation(project(":behandling:regulering:domain"))
44
implementation(project(":behandling:revurdering:domain"))
55
implementation(project(":behandling:søknadsbehandling:domain"))

Diff for: ‎test-common/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
dependencies {
33
val kotestVersion = "5.8.1"
44

5-
api(project(":behandling:domain"))
5+
api(project(":behandling:common:domain"))
66
api(project(":behandling:revurdering:domain"))
77
api(project(":behandling:søknadsbehandling:domain"))
88
api(project(":beregning"))

Diff for: ‎tilbakekreving/application/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dependencies {
22
implementation(project(":common:domain"))
33
implementation(project(":domain"))
44

5-
implementation(project(":behandling:domain"))
5+
implementation(project(":behandling:common:domain"))
66

77
implementation(project(":hendelse:domain"))
88

Diff for: ‎tilbakekreving/domain/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies {
66
implementation(project(":dokument:domain"))
77
implementation(project(":oppgave:domain"))
88
implementation(project(":vedtak:domain"))
9-
implementation(project(":behandling:domain"))
9+
implementation(project(":behandling:common:domain"))
1010

1111
testImplementation(project(":test-common"))
1212
}

Diff for: ‎tilbakekreving/infrastructure/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies {
55
implementation(project(":dokument:infrastructure"))
66
implementation(project(":hendelse:domain"))
77
implementation(project(":tilbakekreving:domain"))
8-
implementation(project(":behandling:domain"))
8+
implementation(project(":behandling:common:domain"))
99

1010
implementation(project(":common:infrastructure"))
1111
implementation(project(":hendelse:infrastructure"))

Diff for: ‎tilbakekreving/presentation/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
implementation(project(":dokument:domain"))
1515
implementation(project(":person:domain"))
1616
implementation(project(":vedtak:domain"))
17-
implementation(project(":behandling:domain"))
17+
implementation(project(":behandling:common:domain"))
1818

1919
implementation(project(":domain"))
2020
implementation(project(":service"))

Diff for: ‎vedtak/application/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dependencies {
33
implementation(project(":domain"))
44

55
implementation(project(":vedtak:domain"))
6-
implementation(project(":behandling:domain"))
6+
implementation(project(":behandling:common:domain"))
77
implementation(project(":behandling:søknadsbehandling:domain"))
88

99
implementation(project(":person:domain"))

Diff for: ‎vedtak/domain/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
implementation(project(":behandling:domain"))
2+
implementation(project(":behandling:common:domain"))
33
implementation(project(":behandling:revurdering:domain"))
44
implementation(project(":behandling:søknadsbehandling:domain"))
55
implementation(project(":beregning"))

Diff for: ‎web-regresjonstest/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
implementation(project(":tilbakekreving:infrastructure"))
3434

3535
implementation(project(":person:domain"))
36-
implementation(project(":behandling:domain"))
36+
implementation(project(":behandling:common:domain"))
3737
implementation(project(":behandling:søknadsbehandling:domain"))
3838
implementation(project(":behandling:revurdering:domain"))
3939
implementation(project(":grunnbeløp"))

Diff for: ‎web/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ avro {
88
}
99

1010
dependencies {
11-
implementation(project(":behandling:domain"))
11+
implementation(project(":behandling:common:domain"))
1212
implementation(project(":behandling:revurdering:domain"))
1313
implementation(project(":behandling:revurdering:presentation"))
1414
implementation(project(":behandling:søknadsbehandling:domain"))

Diff for: ‎økonomi/application/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
implementation(project(":vedtak:domain"))
99
implementation(project(":beregning"))
1010
implementation(project(":satser"))
11-
implementation(project(":behandling:domain"))
11+
implementation(project(":behandling:common:domain"))
1212
}
1313

1414
tasks.named<Jar>("jar") {

0 commit comments

Comments
 (0)